From efea581dcc8b60e4bc51e70f9692df1e889b705f Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Wed, 11 Sep 2019 14:50:08 +0200 Subject: [PATCH] [7.x][Transform]Rename data frame plugin to transform: plugin and package names (#46583) rename data frame transform plugin to transform: - rename plugin data-frame to transform - change all package names from o.e.*.dataframe.* to o.e.*.transform.* - necessary changes to fix loading/testing --- .../elasticsearch/client/DataFrameClient.java | 36 +++++----- .../client/DataFrameRequestConverters.java | 22 +++--- .../GetDataFrameAnalyticsStatsResponse.java | 2 +- .../dataframe/DataFrameAnalyticsConfig.java | 2 +- .../AcknowledgedTasksResponse.java | 2 +- .../DataFrameNamedXContentProvider.java | 6 +- .../DeleteDataFrameTransformRequest.java | 2 +- .../GetDataFrameTransformRequest.java | 2 +- .../GetDataFrameTransformResponse.java | 4 +- .../GetDataFrameTransformStatsRequest.java | 2 +- .../GetDataFrameTransformStatsResponse.java | 4 +- .../PreviewDataFrameTransformRequest.java | 4 +- .../PreviewDataFrameTransformResponse.java | 2 +- .../PutDataFrameTransformRequest.java | 4 +- .../StartDataFrameTransformRequest.java | 2 +- .../StartDataFrameTransformResponse.java | 2 +- .../StopDataFrameTransformRequest.java | 2 +- .../StopDataFrameTransformResponse.java | 2 +- .../UpdateDataFrameTransformRequest.java | 4 +- .../UpdateDataFrameTransformResponse.java | 4 +- .../transforms/DataFrameIndexerPosition.java | 2 +- .../DataFrameIndexerTransformStats.java | 2 +- .../DataFrameTransformCheckpointStats.java | 2 +- .../DataFrameTransformCheckpointingInfo.java | 4 +- .../transforms/DataFrameTransformConfig.java | 6 +- .../DataFrameTransformConfigUpdate.java | 2 +- .../DataFrameTransformProgress.java | 2 +- .../transforms/DataFrameTransformStats.java | 2 +- .../transforms/DestConfig.java | 2 +- .../transforms/NodeAttributes.java | 2 +- .../transforms/QueryConfig.java | 2 +- .../transforms/SourceConfig.java | 2 +- .../transforms/SyncConfig.java | 2 +- .../transforms/TimeSyncConfig.java | 2 +- .../transforms/pivot/AggregationConfig.java | 2 +- .../pivot/DateHistogramGroupSource.java | 2 +- .../transforms/pivot/GroupConfig.java | 2 +- .../pivot/HistogramGroupSource.java | 2 +- .../transforms/pivot/PivotConfig.java | 2 +- .../transforms/pivot/SingleGroupSource.java | 2 +- .../transforms/pivot/TermsGroupSource.java | 2 +- .../transforms/util/TimeUtil.java | 2 +- ...icsearch.plugins.spi.NamedXContentProvider | 4 +- .../DataFrameRequestConvertersTests.java | 28 ++++---- .../client/DataFrameTransformIT.java | 48 ++++++------- .../client/RestHighLevelClientTests.java | 4 +- .../DataFrameTransformDocumentationIT.java | 56 +++++++-------- .../AcknowledgedTasksResponseTests.java | 2 +- .../DeleteDataFrameTransformRequestTests.java | 2 +- .../GetDataFrameTransformRequestTests.java | 2 +- .../GetDataFrameTransformResponseTests.java | 6 +- ...etDataFrameTransformStatsRequestTests.java | 2 +- ...tDataFrameTransformStatsResponseTests.java | 6 +- ...PreviewDataFrameTransformRequestTests.java | 10 +-- ...reviewDataFrameTransformResponseTests.java | 2 +- .../PutDataFrameTransformRequestTests.java | 8 +-- .../StartDataFrameTransformRequestTests.java | 2 +- .../StopDataFrameTransformRequestTests.java | 2 +- .../UpdateDataFrameTransformRequestTests.java | 6 +- ...UpdateDataFrameTransformResponseTests.java | 4 +- .../DataFrameIndexerPositionTests.java | 2 +- .../DataFrameIndexerTransformStatsTests.java | 2 +- ...ataFrameTransformCheckpointStatsTests.java | 2 +- ...aFrameTransformCheckpointingInfoTests.java | 2 +- .../DataFrameTransformConfigTests.java | 10 +-- .../DataFrameTransformConfigUpdateTests.java | 8 +-- .../DataFrameTransformProgressTests.java | 2 +- .../DataFrameTransformStatsTests.java | 2 +- .../transforms/DestConfigTests.java | 2 +- .../transforms/NodeAttributesTests.java | 2 +- .../transforms/QueryConfigTests.java | 2 +- .../transforms/SourceConfigTests.java | 2 +- .../transforms/TimeSyncConfigTests.java | 2 +- .../hlrc/DataFrameIndexerPositionTests.java | 14 ++-- .../DataFrameIndexerTransformStatsTests.java | 16 ++--- ...ataFrameTransformCheckpointStatsTests.java | 14 ++-- ...aFrameTransformCheckpointingInfoTests.java | 16 ++--- .../hlrc/DataFrameTransformProgressTests.java | 14 ++-- .../hlrc/DataFrameTransformStatsTests.java | 26 +++---- .../transforms/hlrc/TimeSyncConfigTests.java | 16 ++--- .../pivot/AggregationConfigTests.java | 2 +- .../pivot/DateHistogramGroupSourceTests.java | 2 +- .../transforms/pivot/GroupConfigTests.java | 2 +- .../pivot/HistogramGroupSourceTests.java | 2 +- .../transforms/pivot/PivotConfigTests.java | 2 +- .../pivot/TermsGroupSourceTests.java | 2 +- .../hlrc/DateHistogramGroupSourceTests.java | 14 ++-- .../xpack/core/XPackClientPlugin.java | 28 ++++---- .../DataFrameFeatureSetUsage.java | 4 +- .../DataFrameField.java | 2 +- .../DataFrameMessages.java | 2 +- .../DataFrameNamedXContentProvider.java | 6 +- .../DeleteDataFrameTransformAction.java | 6 +- .../action/GetDataFrameTransformsAction.java | 6 +- .../GetDataFrameTransformsStatsAction.java | 8 +-- .../PreviewDataFrameTransformAction.java | 8 +-- .../action/PutDataFrameTransformAction.java | 10 +-- .../action/StartDataFrameTransformAction.java | 6 +- .../StartDataFrameTransformTaskAction.java | 6 +- .../action/StopDataFrameTransformAction.java | 6 +- .../UpdateDataFrameTransformAction.java | 8 +-- .../notifications/DataFrameAuditMessage.java | 4 +- .../transforms/DataFrameIndexerPosition.java | 2 +- .../DataFrameIndexerTransformStats.java | 2 +- .../transforms/DataFrameTransform.java | 4 +- .../DataFrameTransformCheckpoint.java | 4 +- .../DataFrameTransformCheckpointStats.java | 4 +- .../DataFrameTransformCheckpointingInfo.java | 2 +- .../transforms/DataFrameTransformConfig.java | 10 +-- .../DataFrameTransformConfigUpdate.java | 8 +-- .../DataFrameTransformProgress.java | 2 +- .../transforms/DataFrameTransformState.java | 4 +- .../transforms/DataFrameTransformStats.java | 4 +- .../DataFrameTransformStoredDoc.java | 4 +- .../DataFrameTransformTaskState.java | 2 +- .../transforms/DestConfig.java | 4 +- .../transforms/NodeAttributes.java | 4 +- .../transforms/QueryConfig.java | 4 +- .../transforms/SourceConfig.java | 4 +- .../transforms/SyncConfig.java | 2 +- .../transforms/TimeSyncConfig.java | 4 +- .../transforms/pivot/AggregationConfig.java | 4 +- .../pivot/DateHistogramGroupSource.java | 2 +- .../transforms/pivot/GroupConfig.java | 8 +-- .../pivot/HistogramGroupSource.java | 2 +- .../transforms/pivot/PivotConfig.java | 6 +- .../transforms/pivot/SingleGroupSource.java | 2 +- .../transforms/pivot/TermsGroupSource.java | 2 +- .../utils/DataFrameStrings.java | 2 +- .../utils/ExceptionsHelper.java | 2 +- .../authz/store/ReservedRolesStoreTests.java | 14 ++-- .../DataFrameFeatureSetUsageTests.java | 4 +- .../DataFrameMessagesTests.java | 2 +- .../AbstractSerializingDataFrameTestCase.java | 10 +-- ...tractWireSerializingDataFrameTestCase.java | 10 +-- ...eDataFrameTransformActionRequestTests.java | 4 +- ...DataFrameTransformsActionRequestTests.java | 4 +- ...ataFrameTransformsActionResponseTests.java | 8 +-- ...rameTransformsStatsActionRequestTests.java | 4 +- ...ameTransformsStatsActionResponseTests.java | 8 +-- ...wDataFrameTransformActionRequestTests.java | 14 ++-- ...ataFrameTransformsActionResponseTests.java | 4 +- ...rameTransformsActionResponseWireTests.java | 4 +- ...tDataFrameTransformActionRequestTests.java | 14 ++-- ...tDataFrameTransformActionRequestTests.java | 4 +- ...DataFrameTransformActionResponseTests.java | 4 +- ...aFrameTransformTaskActionRequestTests.java | 2 +- ...FrameTransformTaskActionResponseTests.java | 2 +- ...pDataFrameTransformActionRequestTests.java | 6 +- ...DataFrameTransformActionResponseTests.java | 4 +- ...eDataFrameTransformActionRequestTests.java | 6 +- ...ataFrameTransformsActionResponseTests.java | 8 +-- .../DataFrameAuditMessageTests.java | 2 +- .../AbstractSerializingDataFrameTestCase.java | 6 +- .../DataFrameIndexerPositionTests.java | 2 +- .../DataFrameIndexerTransformStatsTests.java | 2 +- ...ataFrameTransformCheckpointStatsTests.java | 2 +- .../DataFrameTransformCheckpointTests.java | 2 +- ...aFrameTransformCheckpointingInfoTests.java | 2 +- .../DataFrameTransformConfigTests.java | 10 +-- .../DataFrameTransformConfigUpdateTests.java | 10 +-- .../DataFrameTransformProgressTests.java | 2 +- .../DataFrameTransformStateTests.java | 6 +- .../DataFrameTransformStatsTests.java | 2 +- .../DataFrameTransformStoredDocTests.java | 4 +- .../DataFrameTransformTaskStateTests.java | 2 +- .../transforms/DataFrameTransformTests.java | 2 +- .../transforms/DestConfigTests.java | 2 +- .../MockDeprecatedAggregationBuilder.java | 2 +- .../MockDeprecatedQueryBuilder.java | 2 +- .../transforms/NodeAttributeTests.java | 2 +- .../transforms/QueryConfigTests.java | 2 +- .../transforms/SourceConfigTests.java | 2 +- .../transforms/TimeSyncConfigTests.java | 3 +- .../pivot/AggregationConfigTests.java | 6 +- .../pivot/DateHistogramGroupSourceTests.java | 2 +- .../transforms/pivot/GroupConfigTests.java | 4 +- .../pivot/HistogramGroupSourceTests.java | 2 +- .../transforms/pivot/PivotConfigTests.java | 4 +- .../pivot/TermsGroupSourceTests.java | 2 +- .../utils/DataFrameStringsTests.java | 2 +- .../{data-frame => transform}/build.gradle | 6 +- .../{data-frame => transform}/qa/build.gradle | 0 .../qa/multi-node-tests/build.gradle | 2 +- .../integration/DataFrameIntegTestCase.java | 42 ++++++------ .../integration/DataFrameTransformIT.java | 14 ++-- .../qa/single-node-tests/build.gradle | 4 +- .../integration/DataFrameAuditorIT.java | 2 +- .../DataFrameConfigurationIndexIT.java | 6 +- .../DataFrameGetAndGetStatsIT.java | 2 +- .../integration/DataFrameMetaDataIT.java | 0 .../integration/DataFramePivotRestIT.java | 0 .../integration/DataFrameRestTestCase.java | 4 +- .../DataFrameTaskFailedStateIT.java | 2 +- .../DataFrameTransformInternalIndexIT.java | 18 ++--- .../DataFrameTransformProgressIT.java | 20 +++--- .../integration/DataFrameUsageIT.java | 11 ++- .../xpack/transform}/DataFrame.java | 68 +++++++++---------- .../xpack/transform}/DataFrameFeatureSet.java | 20 +++--- .../transform}/action/DataFrameNodes.java | 4 +- ...ansportDeleteDataFrameTransformAction.java | 12 ++-- ...TransportGetDataFrameTransformsAction.java | 18 ++--- ...portGetDataFrameTransformsStatsAction.java | 24 +++---- ...nsportPreviewDataFrameTransformAction.java | 20 +++--- .../TransportPutDataFrameTransformAction.java | 18 ++--- ...ransportStartDataFrameTransformAction.java | 26 +++---- ...portStartDataFrameTransformTaskAction.java | 6 +- ...TransportStopDataFrameTransformAction.java | 22 +++--- ...ansportUpdateDataFrameTransformAction.java | 28 ++++---- .../checkpoint/CheckpointException.java | 2 +- .../checkpoint/CheckpointProvider.java | 10 +-- .../DataFrameTransformsCheckpointService.java | 16 ++--- .../checkpoint/DefaultCheckpointProvider.java | 18 ++--- .../TimeBasedCheckpointProvider.java | 12 ++-- .../notifications/DataFrameAuditor.java | 6 +- .../persistence/DataFrameInternalIndex.java | 18 ++--- .../DataFrameTransformsConfigManager.java | 12 ++-- .../persistence/DataframeIndex.java | 8 +-- .../persistence/SeqNoPrimaryTermAndIndex.java | 2 +- .../RestDeleteDataFrameTransformAction.java | 6 +- .../RestGetDataFrameTransformsAction.java | 8 +-- ...RestGetDataFrameTransformsStatsAction.java | 8 +-- .../RestPreviewDataFrameTransformAction.java | 6 +- .../RestPutDataFrameTransformAction.java | 6 +- .../RestStartDataFrameTransformAction.java | 6 +- .../RestStopDataFrameTransformAction.java | 6 +- .../RestUpdateDataFrameTransformAction.java | 6 +- .../transforms/ClientDataFrameIndexer.java | 32 ++++----- .../ClientDataFrameIndexerBuilder.java | 20 +++--- .../transforms/DataFrameIndexer.java | 22 +++--- ...FrameTransformPersistentTasksExecutor.java | 32 ++++----- .../transforms/DataFrameTransformTask.java | 32 ++++----- .../transform}/transforms/IDGenerator.java | 2 +- .../transforms/SourceDestValidator.java | 8 +-- .../transforms/TransformProgressGatherer.java | 6 +- .../pivot/AggregationResultUtils.java | 12 ++-- .../transforms/pivot/Aggregations.java | 2 +- .../transform}/transforms/pivot/Pivot.java | 14 ++-- .../transforms/pivot/SchemaUtil.java | 4 +- .../transform}/DataFrameFeatureSetTests.java | 6 +- .../DataFrameSingleNodeTestCase.java | 4 +- .../xpack/transform}/LocalStateDataFrame.java | 3 +- .../action/DataFrameNodesTests.java | 6 +- ...portStopDataFrameTransformActionTests.java | 10 +-- ...meTransformCheckpointServiceNodeTests.java | 24 +++---- ...FrameTransformsCheckpointServiceTests.java | 2 +- .../DefaultCheckpointProviderTests.java | 12 ++-- .../notifications/MockDataFrameAuditor.java | 2 +- ...DataFrameTransformsConfigManagerTests.java | 22 +++--- .../persistence/DataframeIndexTests.java | 4 +- .../SeqNoPrimaryTermAndIndexTests.java | 2 +- ...stDeleteDataFrameTransformActionTests.java | 2 +- .../ClientDataFrameIndexerTests.java | 16 ++--- .../transforms/DataFrameIndexerTests.java | 24 +++---- ...TransformPersistentTasksExecutorTests.java | 12 ++-- .../transforms/IDGeneratorTests.java | 2 +- .../transforms/SourceDestValidatorTests.java | 10 +-- .../pivot/AggregationResultUtilsTests.java | 8 +-- .../transforms/pivot/AggregationsTests.java | 2 +- .../transforms/pivot/PivotTests.java | 16 ++--- .../upgrades/DataFrameSurvivesUpgradeIT.java | 18 ++--- 261 files changed, 965 insertions(+), 966 deletions(-) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/AcknowledgedTasksResponse.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/DataFrameNamedXContentProvider.java (89%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/DeleteDataFrameTransformRequest.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/GetDataFrameTransformRequest.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/GetDataFrameTransformResponse.java (97%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/GetDataFrameTransformStatsRequest.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/GetDataFrameTransformStatsResponse.java (97%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/PreviewDataFrameTransformRequest.java (96%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/PreviewDataFrameTransformResponse.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/PutDataFrameTransformRequest.java (97%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/StartDataFrameTransformRequest.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/StartDataFrameTransformResponse.java (97%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/StopDataFrameTransformRequest.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/StopDataFrameTransformResponse.java (97%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/UpdateDataFrameTransformRequest.java (96%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/UpdateDataFrameTransformResponse.java (94%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameIndexerPosition.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameIndexerTransformStats.java (99%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformCheckpointStats.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformCheckpointingInfo.java (97%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformConfig.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformConfigUpdate.java (99%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformProgress.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformStats.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/DestConfig.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/NodeAttributes.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/QueryConfig.java (97%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/SourceConfig.java (99%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/SyncConfig.java (94%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/TimeSyncConfig.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/AggregationConfig.java (97%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/DateHistogramGroupSource.java (99%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/GroupConfig.java (99%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/HistogramGroupSource.java (98%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/PivotConfig.java (99%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/SingleGroupSource.java (96%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/TermsGroupSource.java (97%) rename client/rest-high-level/src/main/java/org/elasticsearch/client/{dataframe => transform}/transforms/util/TimeUtil.java (97%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/AcknowledgedTasksResponseTests.java (99%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/DeleteDataFrameTransformRequestTests.java (96%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/GetDataFrameTransformRequestTests.java (96%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/GetDataFrameTransformResponseTests.java (95%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/GetDataFrameTransformStatsRequestTests.java (96%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/GetDataFrameTransformStatsResponseTests.java (96%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/PreviewDataFrameTransformRequestTests.java (92%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/PreviewDataFrameTransformResponseTests.java (98%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/PutDataFrameTransformRequestTests.java (93%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/StartDataFrameTransformRequestTests.java (97%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/StopDataFrameTransformRequestTests.java (97%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/UpdateDataFrameTransformRequestTests.java (94%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/UpdateDataFrameTransformResponseTests.java (95%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameIndexerPositionTests.java (98%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameIndexerTransformStatsTests.java (98%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformCheckpointStatsTests.java (98%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformCheckpointingInfoTests.java (98%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformConfigTests.java (91%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformConfigUpdateTests.java (92%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformProgressTests.java (98%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/DataFrameTransformStatsTests.java (98%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/DestConfigTests.java (96%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/NodeAttributesTests.java (97%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/QueryConfigTests.java (97%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/SourceConfigTests.java (97%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/TimeSyncConfigTests.java (96%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/hlrc/DataFrameIndexerPositionTests.java (84%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/hlrc/DataFrameIndexerTransformStatsTests.java (87%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/hlrc/DataFrameTransformCheckpointStatsTests.java (88%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/hlrc/DataFrameTransformCheckpointingInfoTests.java (87%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/hlrc/DataFrameTransformProgressTests.java (84%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/hlrc/DataFrameTransformStatsTests.java (88%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/hlrc/TimeSyncConfigTests.java (80%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/AggregationConfigTests.java (98%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/DateHistogramGroupSourceTests.java (97%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/GroupConfigTests.java (98%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/HistogramGroupSourceTests.java (96%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/PivotConfigTests.java (97%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/TermsGroupSourceTests.java (96%) rename client/rest-high-level/src/test/java/org/elasticsearch/client/{dataframe => transform}/transforms/pivot/hlrc/DateHistogramGroupSourceTests.java (87%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/DataFrameFeatureSetUsage.java (96%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/DataFrameField.java (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/DataFrameMessages.java (99%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/DataFrameNamedXContentProvider.java (82%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/DeleteDataFrameTransformAction.java (93%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/GetDataFrameTransformsAction.java (96%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/GetDataFrameTransformsStatsAction.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/PreviewDataFrameTransformAction.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/PutDataFrameTransformAction.java (95%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/StartDataFrameTransformAction.java (95%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/StartDataFrameTransformTaskAction.java (96%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/StopDataFrameTransformAction.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/UpdateDataFrameTransformAction.java (96%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/notifications/DataFrameAuditMessage.java (90%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameIndexerPosition.java (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameIndexerTransformStats.java (99%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransform.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformCheckpoint.java (99%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformCheckpointStats.java (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformCheckpointingInfo.java (99%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformConfig.java (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformConfigUpdate.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformProgress.java (99%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformState.java (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformStats.java (99%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformStoredDoc.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformTaskState.java (94%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DestConfig.java (96%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/NodeAttributes.java (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/QueryConfig.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/SourceConfig.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/SyncConfig.java (93%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/TimeSyncConfig.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/AggregationConfig.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/DateHistogramGroupSource.java (99%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/GroupConfig.java (96%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/HistogramGroupSource.java (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/PivotConfig.java (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/SingleGroupSource.java (98%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/TermsGroupSource.java (97%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/utils/DataFrameStrings.java (96%) rename x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/{dataframe => transform}/utils/ExceptionsHelper.java (92%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/DataFrameFeatureSetUsageTests.java (91%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/DataFrameMessagesTests.java (98%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/AbstractSerializingDataFrameTestCase.java (86%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/AbstractWireSerializingDataFrameTestCase.java (86%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/DeleteDataFrameTransformActionRequestTests.java (86%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/GetDataFrameTransformsActionRequestTests.java (87%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/GetDataFrameTransformsActionResponseTests.java (94%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/GetDataFrameTransformsStatsActionRequestTests.java (88%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/GetDataFrameTransformsStatsActionResponseTests.java (87%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/PreviewDataFrameTransformActionRequestTests.java (86%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/PreviewDataFrameTransformsActionResponseTests.java (94%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/PreviewDataFrameTransformsActionResponseWireTests.java (90%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/PutDataFrameTransformActionRequestTests.java (80%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/StartDataFrameTransformActionRequestTests.java (86%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/StartDataFrameTransformActionResponseTests.java (84%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/StartDataFrameTransformTaskActionRequestTests.java (94%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/StartDataFrameTransformTaskActionResponseTests.java (94%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/StopDataFrameTransformActionRequestTests.java (93%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/StopDataFrameTransformActionResponseTests.java (84%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/UpdateDataFrameTransformActionRequestTests.java (81%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/action/UpdateDataFrameTransformsActionResponseTests.java (80%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/notifications/DataFrameAuditMessageTests.java (95%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/AbstractSerializingDataFrameTestCase.java (94%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameIndexerPositionTests.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameIndexerTransformStatsTests.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformCheckpointStatsTests.java (96%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformCheckpointTests.java (99%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformCheckpointingInfoTests.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformConfigTests.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformConfigUpdateTests.java (96%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformProgressTests.java (98%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformStateTests.java (91%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformStatsTests.java (96%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformStoredDocTests.java (94%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformTaskStateTests.java (98%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DataFrameTransformTests.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/DestConfigTests.java (95%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/MockDeprecatedAggregationBuilder.java (98%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/MockDeprecatedQueryBuilder.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/NodeAttributeTests.java (96%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/QueryConfigTests.java (98%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/SourceConfigTests.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/TimeSyncConfigTests.java (91%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/AggregationConfigTests.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/DateHistogramGroupSourceTests.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/GroupConfigTests.java (97%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/HistogramGroupSourceTests.java (95%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/PivotConfigTests.java (98%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/transforms/pivot/TermsGroupSourceTests.java (94%) rename x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/{dataframe => transform}/utils/DataFrameStringsTests.java (95%) rename x-pack/plugin/{data-frame => transform}/build.gradle (87%) rename x-pack/plugin/{data-frame => transform}/qa/build.gradle (100%) rename x-pack/plugin/{data-frame => transform}/qa/multi-node-tests/build.gradle (96%) rename x-pack/plugin/{data-frame => transform}/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameIntegTestCase.java (92%) rename x-pack/plugin/{data-frame => transform}/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformIT.java (96%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/build.gradle (87%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameAuditorIT.java (98%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameConfigurationIndexIT.java (93%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameGetAndGetStatsIT.java (99%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameMetaDataIT.java (100%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFramePivotRestIT.java (100%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameRestTestCase.java (99%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTaskFailedStateIT.java (99%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformInternalIndexIT.java (91%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformProgressIT.java (93%) rename x-pack/plugin/{data-frame => transform}/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameUsageIT.java (94%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/DataFrame.java (83%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/DataFrameFeatureSet.java (94%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/DataFrameNodes.java (93%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/TransportDeleteDataFrameTransformAction.java (92%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/TransportGetDataFrameTransformsAction.java (86%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/TransportGetDataFrameTransformsStatsAction.java (94%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/TransportPreviewDataFrameTransformAction.java (94%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/TransportPutDataFrameTransformAction.java (95%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/TransportStartDataFrameTransformAction.java (95%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/TransportStartDataFrameTransformTaskAction.java (96%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/TransportStopDataFrameTransformAction.java (95%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/action/TransportUpdateDataFrameTransformAction.java (94%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/checkpoint/CheckpointException.java (91%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/checkpoint/CheckpointProvider.java (89%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/checkpoint/DataFrameTransformsCheckpointService.java (87%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/checkpoint/DefaultCheckpointProvider.java (96%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/checkpoint/TimeBasedCheckpointProvider.java (91%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/notifications/DataFrameAuditor.java (81%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/persistence/DataFrameInternalIndex.java (96%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/persistence/DataFrameTransformsConfigManager.java (98%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/persistence/DataframeIndex.java (94%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/persistence/SeqNoPrimaryTermAndIndex.java (97%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/rest/action/RestDeleteDataFrameTransformAction.java (89%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/rest/action/RestGetDataFrameTransformsAction.java (89%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/rest/action/RestGetDataFrameTransformsStatsAction.java (89%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/rest/action/RestPreviewDataFrameTransformAction.java (88%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/rest/action/RestPutDataFrameTransformAction.java (89%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/rest/action/RestStartDataFrameTransformAction.java (90%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/rest/action/RestStopDataFrameTransformAction.java (91%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/rest/action/RestUpdateDataFrameTransformAction.java (90%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/ClientDataFrameIndexer.java (96%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/ClientDataFrameIndexerBuilder.java (86%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/DataFrameIndexer.java (96%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/DataFrameTransformPersistentTasksExecutor.java (94%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/DataFrameTransformTask.java (95%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/IDGenerator.java (98%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/SourceDestValidator.java (96%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/TransformProgressGatherer.java (94%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/pivot/AggregationResultUtils.java (97%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/pivot/Aggregations.java (97%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/pivot/Pivot.java (96%) rename x-pack/plugin/{data-frame/src/main/java/org/elasticsearch/xpack/dataframe => transform/src/main/java/org/elasticsearch/xpack/transform}/transforms/pivot/SchemaUtil.java (98%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/DataFrameFeatureSetTests.java (97%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/DataFrameSingleNodeTestCase.java (96%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/LocalStateDataFrame.java (95%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/action/DataFrameNodesTests.java (94%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/action/TransportStopDataFrameTransformActionTests.java (93%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java (94%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/checkpoint/DataFrameTransformsCheckpointServiceTests.java (99%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/checkpoint/DefaultCheckpointProviderTests.java (95%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/notifications/MockDataFrameAuditor.java (98%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/persistence/DataFrameTransformsConfigManagerTests.java (96%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/persistence/DataframeIndexTests.java (96%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/persistence/SeqNoPrimaryTermAndIndexTests.java (97%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/rest/action/RestDeleteDataFrameTransformActionTests.java (97%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/transforms/ClientDataFrameIndexerTests.java (88%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/transforms/DataFrameIndexerTests.java (94%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/transforms/DataFrameTransformPersistentTasksExecutorTests.java (96%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/transforms/IDGeneratorTests.java (97%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/transforms/SourceDestValidatorTests.java (96%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/transforms/pivot/AggregationResultUtilsTests.java (99%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/transforms/pivot/AggregationsTests.java (98%) rename x-pack/plugin/{data-frame/src/test/java/org/elasticsearch/xpack/dataframe => transform/src/test/java/org/elasticsearch/xpack/transform}/transforms/pivot/PivotTests.java (96%) diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameClient.java index f5104c16022..01d79e7640e 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameClient.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameClient.java @@ -21,20 +21,20 @@ package org.elasticsearch.client; import org.elasticsearch.action.ActionListener; import org.elasticsearch.client.core.AcknowledgedResponse; -import org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsResponse; -import org.elasticsearch.client.dataframe.PreviewDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.PreviewDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.PutDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.StopDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StopDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformResponse; +import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformResponse; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsResponse; +import org.elasticsearch.client.transform.PreviewDataFrameTransformRequest; +import org.elasticsearch.client.transform.PreviewDataFrameTransformResponse; +import org.elasticsearch.client.transform.PutDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformResponse; +import org.elasticsearch.client.transform.StopDataFrameTransformRequest; +import org.elasticsearch.client.transform.StopDataFrameTransformResponse; +import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest; +import org.elasticsearch.client.transform.UpdateDataFrameTransformResponse; import java.io.IOException; import java.util.Collections; @@ -55,7 +55,7 @@ public final class DataFrameClient { * Create data frame transform documentation * * @param request The PutDataFrameTransformRequest containing the - * {@link org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig}. + * {@link org.elasticsearch.client.transform.transforms.DataFrameTransformConfig}. * @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized * @return An AcknowledgedResponse object indicating request success * @throws IOException when there is a serialization issue sending the request or receiving the response @@ -76,7 +76,7 @@ public final class DataFrameClient { * Create data frame transform documentation * * @param request The PutDataFrameTransformRequest containing the - * {@link org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig}. + * {@link org.elasticsearch.client.transform.transforms.DataFrameTransformConfig}. * @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized * @param listener Listener to be notified upon request completion */ @@ -98,7 +98,7 @@ public final class DataFrameClient { * Create data frame transform documentation * * @param request The UpdateDataFrameTransformRequest containing the - * {@link org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate}. + * {@link org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate}. * @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized * @return An UpdateDataFrameTransformResponse object containing the updated configuration * @throws IOException when there is a serialization issue sending the request or receiving the response @@ -120,7 +120,7 @@ public final class DataFrameClient { * Create data frame transform documentation * * @param request The UpdateDataFrameTransformRequest containing the - * {@link org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate}. + * {@link org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate}. * @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized * @param listener Listener to be notified upon request completion */ diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameRequestConverters.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameRequestConverters.java index 375c0a7c3af..ab8c79a1784 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameRequestConverters.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameRequestConverters.java @@ -24,23 +24,23 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPut; import org.elasticsearch.client.core.PageParams; -import org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsRequest; -import org.elasticsearch.client.dataframe.PreviewDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.PutDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StopDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformRequest; +import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest; +import org.elasticsearch.client.transform.PreviewDataFrameTransformRequest; +import org.elasticsearch.client.transform.PutDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformRequest; +import org.elasticsearch.client.transform.StopDataFrameTransformRequest; +import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest; import org.elasticsearch.common.Strings; import java.io.IOException; import static org.elasticsearch.client.RequestConverters.REQUEST_BODY_CONTENT_TYPE; import static org.elasticsearch.client.RequestConverters.createEntity; -import static org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest.FORCE; -import static org.elasticsearch.client.dataframe.GetDataFrameTransformRequest.ALLOW_NO_MATCH; -import static org.elasticsearch.client.dataframe.PutDataFrameTransformRequest.DEFER_VALIDATION; +import static org.elasticsearch.client.transform.DeleteDataFrameTransformRequest.FORCE; +import static org.elasticsearch.client.transform.GetDataFrameTransformRequest.ALLOW_NO_MATCH; +import static org.elasticsearch.client.transform.PutDataFrameTransformRequest.DEFER_VALIDATION; final class DataFrameRequestConverters { diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/GetDataFrameAnalyticsStatsResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/GetDataFrameAnalyticsStatsResponse.java index 5391a576e98..bfe7d21dfba 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/GetDataFrameAnalyticsStatsResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/GetDataFrameAnalyticsStatsResponse.java @@ -21,8 +21,8 @@ package org.elasticsearch.client.ml; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.TaskOperationFailure; -import org.elasticsearch.client.dataframe.AcknowledgedTasksResponse; import org.elasticsearch.client.ml.dataframe.DataFrameAnalyticsStats; +import org.elasticsearch.client.transform.AcknowledgedTasksResponse; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/DataFrameAnalyticsConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/DataFrameAnalyticsConfig.java index cdba0e5d5c7..1c333c0bad0 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/DataFrameAnalyticsConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/DataFrameAnalyticsConfig.java @@ -20,7 +20,7 @@ package org.elasticsearch.client.ml.dataframe; import org.elasticsearch.Version; -import org.elasticsearch.client.dataframe.transforms.util.TimeUtil; +import org.elasticsearch.client.transform.transforms.util.TimeUtil; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/AcknowledgedTasksResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/AcknowledgedTasksResponse.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/AcknowledgedTasksResponse.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/AcknowledgedTasksResponse.java index bccaf609d5f..32cfc5aee2b 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/AcknowledgedTasksResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/AcknowledgedTasksResponse.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.TaskOperationFailure; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/DataFrameNamedXContentProvider.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/DataFrameNamedXContentProvider.java similarity index 89% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/DataFrameNamedXContentProvider.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/DataFrameNamedXContentProvider.java index 940b136c93d..bf4d5b4ade1 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/DataFrameNamedXContentProvider.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/DataFrameNamedXContentProvider.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; -import org.elasticsearch.client.dataframe.transforms.SyncConfig; -import org.elasticsearch.client.dataframe.transforms.TimeSyncConfig; +import org.elasticsearch.client.transform.transforms.SyncConfig; +import org.elasticsearch.client.transform.transforms.TimeSyncConfig; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.plugins.spi.NamedXContentProvider; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/DeleteDataFrameTransformRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/DeleteDataFrameTransformRequest.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/DeleteDataFrameTransformRequest.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/DeleteDataFrameTransformRequest.java index 18323a7b2e4..d28779efd1d 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/DeleteDataFrameTransformRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/DeleteDataFrameTransformRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.Validatable; import org.elasticsearch.client.ValidationException; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformRequest.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformRequest.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformRequest.java index cc69e0bd4cd..3c442b65010 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.Validatable; import org.elasticsearch.client.ValidationException; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformResponse.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformResponse.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformResponse.java index 93fc91f08ce..e1ca2df503d 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformResponse.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsRequest.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsRequest.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsRequest.java index 7522ae0d67c..579dd715cbc 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.Validatable; import org.elasticsearch.client.ValidationException; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsResponse.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsResponse.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsResponse.java index fe4698257ea..a1c4fc81974 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsResponse.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.TaskOperationFailure; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformStats; +import org.elasticsearch.client.transform.transforms.DataFrameTransformStats; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/PreviewDataFrameTransformRequest.java similarity index 96% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformRequest.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/PreviewDataFrameTransformRequest.java index 0e1cc1c71c8..ab06ebfa4c9 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/PreviewDataFrameTransformRequest.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.Validatable; import org.elasticsearch.client.ValidationException; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/PreviewDataFrameTransformResponse.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformResponse.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/PreviewDataFrameTransformResponse.java index 40e87b5768b..9f7cd2b313a 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/PreviewDataFrameTransformResponse.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/PutDataFrameTransformRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/PutDataFrameTransformRequest.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/PutDataFrameTransformRequest.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/PutDataFrameTransformRequest.java index 814414f04ee..e948ae53e0d 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/PutDataFrameTransformRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/PutDataFrameTransformRequest.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.Validatable; import org.elasticsearch.client.ValidationException; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StartDataFrameTransformRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StartDataFrameTransformRequest.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StartDataFrameTransformRequest.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StartDataFrameTransformRequest.java index 380105eec5f..208bebf58ab 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StartDataFrameTransformRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StartDataFrameTransformRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.Validatable; import org.elasticsearch.client.ValidationException; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StartDataFrameTransformResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StartDataFrameTransformResponse.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StartDataFrameTransformResponse.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StartDataFrameTransformResponse.java index 9b358ffdfa1..9a96d2de7ae 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StartDataFrameTransformResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StartDataFrameTransformResponse.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.TaskOperationFailure; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StopDataFrameTransformRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StopDataFrameTransformRequest.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StopDataFrameTransformRequest.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StopDataFrameTransformRequest.java index 4fb6164f2cc..3a662c2caec 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StopDataFrameTransformRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StopDataFrameTransformRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.Validatable; import org.elasticsearch.client.ValidationException; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StopDataFrameTransformResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StopDataFrameTransformResponse.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StopDataFrameTransformResponse.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StopDataFrameTransformResponse.java index 6d32474f70c..3993679fba8 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/StopDataFrameTransformResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/StopDataFrameTransformResponse.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.TaskOperationFailure; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/UpdateDataFrameTransformRequest.java similarity index 96% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformRequest.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/UpdateDataFrameTransformRequest.java index f5fdb9edbb2..d4fe836db0f 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/UpdateDataFrameTransformRequest.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.Validatable; import org.elasticsearch.client.ValidationException; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/UpdateDataFrameTransformResponse.java similarity index 94% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformResponse.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/UpdateDataFrameTransformResponse.java index 30b47c27d59..2afc8f9f3f5 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/UpdateDataFrameTransformResponse.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; import org.elasticsearch.common.xcontent.XContentParser; import java.util.Objects; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerPosition.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerPosition.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerPosition.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerPosition.java index 86a2527ffdd..6141f77c3b0 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerPosition.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerPosition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerTransformStats.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerTransformStats.java similarity index 99% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerTransformStats.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerTransformStats.java index f184810609a..23a25c511b2 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerTransformStats.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerTransformStats.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.client.core.IndexerJobStats; import org.elasticsearch.common.ParseField; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointStats.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointStats.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointStats.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointStats.java index 7c8d853768b..1f9606fe2dc 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointStats.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointStats.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointingInfo.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointingInfo.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointingInfo.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointingInfo.java index 659863c3cf3..79d02c523ff 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointingInfo.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointingInfo.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; -import org.elasticsearch.client.dataframe.transforms.util.TimeUtil; +import org.elasticsearch.client.transform.transforms.util.TimeUtil; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfig.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfig.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfig.java index 2810d6a8cfa..d3abc73e6f3 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfig.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.Version; -import org.elasticsearch.client.dataframe.transforms.pivot.PivotConfig; -import org.elasticsearch.client.dataframe.transforms.util.TimeUtil; +import org.elasticsearch.client.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.client.transform.transforms.util.TimeUtil; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfigUpdate.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfigUpdate.java similarity index 99% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfigUpdate.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfigUpdate.java index afca172b564..945e8b82116 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfigUpdate.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfigUpdate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformProgress.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformProgress.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformProgress.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformProgress.java index 96920651035..73eacac8513 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformProgress.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformProgress.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformStats.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformStats.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformStats.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformStats.java index 578bed0d37f..ccf2a18fb34 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformStats.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DataFrameTransformStats.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DestConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DestConfig.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DestConfig.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DestConfig.java index f808fa86720..9dce70efe23 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DestConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/DestConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/NodeAttributes.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/NodeAttributes.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/NodeAttributes.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/NodeAttributes.java index 85c2b9644c2..a4b2a6f1fd9 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/NodeAttributes.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/NodeAttributes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/QueryConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/QueryConfig.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/QueryConfig.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/QueryConfig.java index 31b1fe48108..3f4727863a2 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/QueryConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/QueryConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/SourceConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/SourceConfig.java similarity index 99% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/SourceConfig.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/SourceConfig.java index 7cafa5a8905..fa72bc32391 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/SourceConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/SourceConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/SyncConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/SyncConfig.java similarity index 94% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/SyncConfig.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/SyncConfig.java index 3ead35d0a49..c21418f3f75 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/SyncConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/SyncConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.xcontent.ToXContentObject; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/TimeSyncConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/TimeSyncConfig.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/TimeSyncConfig.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/TimeSyncConfig.java index 797ca3f8961..a31006df5e7 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/TimeSyncConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/TimeSyncConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.unit.TimeValue; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/AggregationConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/AggregationConfig.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/AggregationConfig.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/AggregationConfig.java index ceb5f1e1247..ed87cb20ab7 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/AggregationConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/AggregationConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/DateHistogramGroupSource.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/DateHistogramGroupSource.java similarity index 99% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/DateHistogramGroupSource.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/DateHistogramGroupSource.java index c8fb885896d..6c775142539 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/DateHistogramGroupSource.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/DateHistogramGroupSource.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/GroupConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/GroupConfig.java similarity index 99% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/GroupConfig.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/GroupConfig.java index 950d35e4054..22ee9682998 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/GroupConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/GroupConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/HistogramGroupSource.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/HistogramGroupSource.java similarity index 98% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/HistogramGroupSource.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/HistogramGroupSource.java index 390e4c8b64a..c3e9f53d8d7 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/HistogramGroupSource.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/HistogramGroupSource.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/PivotConfig.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/PivotConfig.java similarity index 99% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/PivotConfig.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/PivotConfig.java index 6fdbeb8a43a..1f01ebd0b30 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/PivotConfig.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/PivotConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/SingleGroupSource.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/SingleGroupSource.java similarity index 96% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/SingleGroupSource.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/SingleGroupSource.java index b1234277d8c..abd03620c87 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/SingleGroupSource.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/SingleGroupSource.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ToXContentObject; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/TermsGroupSource.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/TermsGroupSource.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/TermsGroupSource.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/TermsGroupSource.java index d1bacdbc0a6..885d86e7eeb 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/TermsGroupSource.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/TermsGroupSource.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/util/TimeUtil.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/util/TimeUtil.java similarity index 97% rename from client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/util/TimeUtil.java rename to client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/util/TimeUtil.java index 2470c3f7a4a..e2d72f91e55 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/util/TimeUtil.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/util/TimeUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.client.dataframe.transforms.util; +package org.elasticsearch.client.transform.transforms.util; import org.elasticsearch.common.time.DateFormatters; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/client/rest-high-level/src/main/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider b/client/rest-high-level/src/main/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider index dde81e43867..d558383dd14 100644 --- a/client/rest-high-level/src/main/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider +++ b/client/rest-high-level/src/main/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider @@ -1,4 +1,4 @@ -org.elasticsearch.client.dataframe.DataFrameNamedXContentProvider org.elasticsearch.client.indexlifecycle.IndexLifecycleNamedXContentProvider org.elasticsearch.client.ml.dataframe.MlDataFrameAnalysisNamedXContentProvider -org.elasticsearch.client.ml.dataframe.evaluation.MlEvaluationNamedXContentProvider \ No newline at end of file +org.elasticsearch.client.ml.dataframe.evaluation.MlEvaluationNamedXContentProvider +org.elasticsearch.client.transform.DataFrameNamedXContentProvider diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameRequestConvertersTests.java index 207d6c13d58..24d91922980 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameRequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameRequestConvertersTests.java @@ -24,19 +24,19 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPut; import org.elasticsearch.client.core.PageParams; -import org.elasticsearch.client.dataframe.DataFrameNamedXContentProvider; -import org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsRequest; -import org.elasticsearch.client.dataframe.PreviewDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.PutDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StopDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigTests; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdateTests; +import org.elasticsearch.client.transform.DataFrameNamedXContentProvider; +import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest; +import org.elasticsearch.client.transform.PreviewDataFrameTransformRequest; +import org.elasticsearch.client.transform.PutDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformRequest; +import org.elasticsearch.client.transform.StopDataFrameTransformRequest; +import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdateTests; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -49,7 +49,7 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import static org.elasticsearch.client.dataframe.GetDataFrameTransformRequest.ALLOW_NO_MATCH; +import static org.elasticsearch.client.transform.GetDataFrameTransformRequest.ALLOW_NO_MATCH; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasEntry; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java index 7633aef964a..9b952a27ba0 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java @@ -26,32 +26,32 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.client.core.AcknowledgedResponse; import org.elasticsearch.client.core.PageParams; -import org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsResponse; -import org.elasticsearch.client.dataframe.PreviewDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.PreviewDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.PutDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.StopDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StopDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformStats; -import org.elasticsearch.client.dataframe.transforms.DestConfig; -import org.elasticsearch.client.dataframe.transforms.SourceConfig; -import org.elasticsearch.client.dataframe.transforms.TimeSyncConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.GroupConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.PivotConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.TermsGroupSource; import org.elasticsearch.client.indices.CreateIndexRequest; import org.elasticsearch.client.indices.CreateIndexResponse; +import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformResponse; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsResponse; +import org.elasticsearch.client.transform.PreviewDataFrameTransformRequest; +import org.elasticsearch.client.transform.PreviewDataFrameTransformResponse; +import org.elasticsearch.client.transform.PutDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformResponse; +import org.elasticsearch.client.transform.StopDataFrameTransformRequest; +import org.elasticsearch.client.transform.StopDataFrameTransformResponse; +import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest; +import org.elasticsearch.client.transform.UpdateDataFrameTransformResponse; +import org.elasticsearch.client.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate; +import org.elasticsearch.client.transform.transforms.DataFrameTransformStats; +import org.elasticsearch.client.transform.transforms.DestConfig; +import org.elasticsearch.client.transform.transforms.SourceConfig; +import org.elasticsearch.client.transform.transforms.TimeSyncConfig; +import org.elasticsearch.client.transform.transforms.pivot.GroupConfig; +import org.elasticsearch.client.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.client.transform.transforms.pivot.TermsGroupSource; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java index e89035598bc..799b7344a83 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java @@ -45,8 +45,6 @@ import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.client.core.MainRequest; import org.elasticsearch.client.core.MainResponse; -import org.elasticsearch.client.dataframe.transforms.SyncConfig; -import org.elasticsearch.client.dataframe.transforms.TimeSyncConfig; import org.elasticsearch.client.indexlifecycle.AllocateAction; import org.elasticsearch.client.indexlifecycle.DeleteAction; import org.elasticsearch.client.indexlifecycle.ForceMergeAction; @@ -67,6 +65,8 @@ import org.elasticsearch.client.ml.dataframe.evaluation.softclassification.Binar import org.elasticsearch.client.ml.dataframe.evaluation.softclassification.ConfusionMatrixMetric; import org.elasticsearch.client.ml.dataframe.evaluation.softclassification.PrecisionMetric; import org.elasticsearch.client.ml.dataframe.evaluation.softclassification.RecallMetric; +import org.elasticsearch.client.transform.transforms.SyncConfig; +import org.elasticsearch.client.transform.transforms.TimeSyncConfig; import org.elasticsearch.common.CheckedFunction; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java index 8dedfd83af7..d4cef221401 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java @@ -26,36 +26,36 @@ import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.core.AcknowledgedResponse; import org.elasticsearch.client.core.PageParams; -import org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsResponse; -import org.elasticsearch.client.dataframe.PreviewDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.PreviewDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.PutDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.StopDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StopDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformProgress; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformStats; -import org.elasticsearch.client.dataframe.transforms.DestConfig; -import org.elasticsearch.client.dataframe.transforms.NodeAttributes; -import org.elasticsearch.client.dataframe.transforms.QueryConfig; -import org.elasticsearch.client.dataframe.transforms.SourceConfig; -import org.elasticsearch.client.dataframe.transforms.TimeSyncConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.AggregationConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.GroupConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.PivotConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.TermsGroupSource; import org.elasticsearch.client.indices.CreateIndexRequest; import org.elasticsearch.client.indices.CreateIndexResponse; +import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformResponse; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsResponse; +import org.elasticsearch.client.transform.PreviewDataFrameTransformRequest; +import org.elasticsearch.client.transform.PreviewDataFrameTransformResponse; +import org.elasticsearch.client.transform.PutDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformResponse; +import org.elasticsearch.client.transform.StopDataFrameTransformRequest; +import org.elasticsearch.client.transform.StopDataFrameTransformResponse; +import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest; +import org.elasticsearch.client.transform.UpdateDataFrameTransformResponse; +import org.elasticsearch.client.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate; +import org.elasticsearch.client.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.client.transform.transforms.DataFrameTransformStats; +import org.elasticsearch.client.transform.transforms.DestConfig; +import org.elasticsearch.client.transform.transforms.NodeAttributes; +import org.elasticsearch.client.transform.transforms.QueryConfig; +import org.elasticsearch.client.transform.transforms.SourceConfig; +import org.elasticsearch.client.transform.transforms.TimeSyncConfig; +import org.elasticsearch.client.transform.transforms.pivot.AggregationConfig; +import org.elasticsearch.client.transform.transforms.pivot.GroupConfig; +import org.elasticsearch.client.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.client.transform.transforms.pivot.TermsGroupSource; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.MatchAllQueryBuilder; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/AcknowledgedTasksResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/AcknowledgedTasksResponseTests.java similarity index 99% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/AcknowledgedTasksResponseTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/AcknowledgedTasksResponseTests.java index df7fcc14b95..b12cea0b897 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/AcknowledgedTasksResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/AcknowledgedTasksResponseTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.TaskOperationFailure; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/DeleteDataFrameTransformRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/DeleteDataFrameTransformRequestTests.java similarity index 96% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/DeleteDataFrameTransformRequestTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/DeleteDataFrameTransformRequestTests.java index 390d90361c5..dd20d513970 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/DeleteDataFrameTransformRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/DeleteDataFrameTransformRequestTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformRequestTests.java similarity index 96% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformRequestTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformRequestTests.java index 818eea4520a..044d880f8e8 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformRequestTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformResponseTests.java similarity index 95% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformResponseTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformResponseTests.java index 2bedb7d095f..90c2c286077 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformResponseTests.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigTests; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsRequestTests.java similarity index 96% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsRequestTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsRequestTests.java index 300a8180168..68fd9ff8853 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsRequestTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsResponseTests.java similarity index 96% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsResponseTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsResponseTests.java index 3a10a162ea9..d903215284a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/GetDataFrameTransformStatsResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsResponseTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.TaskOperationFailure; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformStats; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformStatsTests; +import org.elasticsearch.client.transform.transforms.DataFrameTransformStats; +import org.elasticsearch.client.transform.transforms.DataFrameTransformStatsTests; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/PreviewDataFrameTransformRequestTests.java similarity index 92% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformRequestTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/PreviewDataFrameTransformRequestTests.java index 45d5d879d47..d4e98685832 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/PreviewDataFrameTransformRequestTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.ValidationException; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigTests; -import org.elasticsearch.client.dataframe.transforms.pivot.PivotConfigTests; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.client.transform.transforms.pivot.PivotConfigTests; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.elasticsearch.client.dataframe.transforms.SourceConfigTests.randomSourceConfig; +import static org.elasticsearch.client.transform.transforms.SourceConfigTests.randomSourceConfig; import static org.hamcrest.Matchers.containsString; public class PreviewDataFrameTransformRequestTests extends AbstractXContentTestCase { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/PreviewDataFrameTransformResponseTests.java similarity index 98% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformResponseTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/PreviewDataFrameTransformResponseTests.java index 28b7e52aac1..c8f852c68c9 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/PreviewDataFrameTransformResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/PreviewDataFrameTransformResponseTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/PutDataFrameTransformRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/PutDataFrameTransformRequestTests.java similarity index 93% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/PutDataFrameTransformRequestTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/PutDataFrameTransformRequestTests.java index 7c7cd3fa151..19af4bfe5a0 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/PutDataFrameTransformRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/PutDataFrameTransformRequestTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.ValidationException; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigTests; -import org.elasticsearch.client.dataframe.transforms.pivot.PivotConfigTests; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.client.transform.transforms.pivot.PivotConfigTests; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/StartDataFrameTransformRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/StartDataFrameTransformRequestTests.java similarity index 97% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/StartDataFrameTransformRequestTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/StartDataFrameTransformRequestTests.java index 6db4d1cd36f..f4950fc057a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/StartDataFrameTransformRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/StartDataFrameTransformRequestTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.ValidationException; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/StopDataFrameTransformRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/StopDataFrameTransformRequestTests.java similarity index 97% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/StopDataFrameTransformRequestTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/StopDataFrameTransformRequestTests.java index 56b22d57c07..5b28983c086 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/StopDataFrameTransformRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/StopDataFrameTransformRequestTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.ValidationException; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/UpdateDataFrameTransformRequestTests.java similarity index 94% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformRequestTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/UpdateDataFrameTransformRequestTests.java index c9f43a44bd7..7944b486c9e 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/UpdateDataFrameTransformRequestTests.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; import org.elasticsearch.client.ValidationException; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; @@ -32,7 +32,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdateTests.randomDataFrameTransformConfigUpdate; +import static org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdateTests.randomDataFrameTransformConfigUpdate; import static org.hamcrest.Matchers.containsString; public class UpdateDataFrameTransformRequestTests extends AbstractXContentTestCase { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/UpdateDataFrameTransformResponseTests.java similarity index 95% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformResponseTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/UpdateDataFrameTransformResponseTests.java index efbb1ef4672..a2b20d4516d 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/UpdateDataFrameTransformResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/UpdateDataFrameTransformResponseTests.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.client.dataframe; +package org.elasticsearch.client.transform; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigTests; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerPositionTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerPositionTests.java similarity index 98% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerPositionTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerPositionTests.java index cd17dd3fe8e..e4d1c505532 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerPositionTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerPositionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerTransformStatsTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerTransformStatsTests.java similarity index 98% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerTransformStatsTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerTransformStatsTests.java index 75557caea2f..f6174815aa4 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameIndexerTransformStatsTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameIndexerTransformStatsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.client.core.IndexerJobStats; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointStatsTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointStatsTests.java similarity index 98% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointStatsTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointStatsTests.java index ec7e8b6422e..d03651170f7 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointStatsTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointStatsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointingInfoTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointingInfoTests.java similarity index 98% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointingInfoTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointingInfoTests.java index 23ac6748898..2ec042a4a6a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointingInfoTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformCheckpointingInfoTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfigTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfigTests.java similarity index 91% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfigTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfigTests.java index 88191809e22..a70a580c620 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfigTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfigTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; -import org.elasticsearch.client.dataframe.DataFrameNamedXContentProvider; import org.elasticsearch.Version; -import org.elasticsearch.client.dataframe.transforms.pivot.PivotConfigTests; +import org.elasticsearch.client.transform.DataFrameNamedXContentProvider; +import org.elasticsearch.client.transform.transforms.pivot.PivotConfigTests; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -35,8 +35,8 @@ import java.util.Collections; import java.util.List; import java.util.function.Predicate; -import static org.elasticsearch.client.dataframe.transforms.DestConfigTests.randomDestConfig; -import static org.elasticsearch.client.dataframe.transforms.SourceConfigTests.randomSourceConfig; +import static org.elasticsearch.client.transform.transforms.DestConfigTests.randomDestConfig; +import static org.elasticsearch.client.transform.transforms.SourceConfigTests.randomSourceConfig; public class DataFrameTransformConfigTests extends AbstractXContentTestCase { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfigUpdateTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfigUpdateTests.java similarity index 92% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfigUpdateTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfigUpdateTests.java index e4d69a84968..7d5cca0e60b 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfigUpdateTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformConfigUpdateTests.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; -import org.elasticsearch.client.dataframe.DataFrameNamedXContentProvider; +import org.elasticsearch.client.transform.DataFrameNamedXContentProvider; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -31,8 +31,8 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import static org.elasticsearch.client.dataframe.transforms.DestConfigTests.randomDestConfig; -import static org.elasticsearch.client.dataframe.transforms.SourceConfigTests.randomSourceConfig; +import static org.elasticsearch.client.transform.transforms.DestConfigTests.randomDestConfig; +import static org.elasticsearch.client.transform.transforms.SourceConfigTests.randomSourceConfig; public class DataFrameTransformConfigUpdateTests extends AbstractXContentTestCase { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformProgressTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformProgressTests.java similarity index 98% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformProgressTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformProgressTests.java index 3792d4855db..faf6805ac27 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformProgressTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformProgressTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformStatsTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformStatsTests.java similarity index 98% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformStatsTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformStatsTests.java index ae252069c61..4b3658f6ea1 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformStatsTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DataFrameTransformStatsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DestConfigTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DestConfigTests.java similarity index 96% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DestConfigTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DestConfigTests.java index 0dc8f99d763..ce2fe8538aa 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/DestConfigTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/DestConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.AbstractXContentTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/NodeAttributesTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/NodeAttributesTests.java similarity index 97% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/NodeAttributesTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/NodeAttributesTests.java index 661aa9f7a30..1ca1bf65f6c 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/NodeAttributesTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/NodeAttributesTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.AbstractXContentTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/QueryConfigTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/QueryConfigTests.java similarity index 97% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/QueryConfigTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/QueryConfigTests.java index 644858cab28..e8d3a6a2ad1 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/QueryConfigTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/QueryConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/SourceConfigTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/SourceConfigTests.java similarity index 97% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/SourceConfigTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/SourceConfigTests.java index 722c265c9a0..dede3d2f256 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/SourceConfigTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/SourceConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/TimeSyncConfigTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/TimeSyncConfigTests.java similarity index 96% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/TimeSyncConfigTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/TimeSyncConfigTests.java index dd2a17eb026..10437a3154c 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/TimeSyncConfigTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/TimeSyncConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms; +package org.elasticsearch.client.transform.transforms; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerPositionTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameIndexerPositionTests.java similarity index 84% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerPositionTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameIndexerPositionTests.java index 620629f1760..7d9ad3e4b0a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerPositionTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameIndexerPositionTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.hlrc; +package org.elasticsearch.client.transform.transforms.hlrc; import org.elasticsearch.client.AbstractResponseTestCase; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; import java.util.LinkedHashMap; import java.util.Map; @@ -31,10 +31,10 @@ import static org.hamcrest.Matchers.equalTo; public class DataFrameIndexerPositionTests extends AbstractResponseTestCase< DataFrameIndexerPosition, - org.elasticsearch.client.dataframe.transforms.DataFrameIndexerPosition> { + org.elasticsearch.client.transform.transforms.DataFrameIndexerPosition> { public static DataFrameIndexerPosition fromHlrc( - org.elasticsearch.client.dataframe.transforms.DataFrameIndexerPosition instance) { + org.elasticsearch.client.transform.transforms.DataFrameIndexerPosition instance) { if (instance == null) { return null; } @@ -51,13 +51,13 @@ public class DataFrameIndexerPositionTests extends AbstractResponseTestCase< } @Override - protected org.elasticsearch.client.dataframe.transforms.DataFrameIndexerPosition doParseToClientInstance(XContentParser parser) { - return org.elasticsearch.client.dataframe.transforms.DataFrameIndexerPosition.fromXContent(parser); + protected org.elasticsearch.client.transform.transforms.DataFrameIndexerPosition doParseToClientInstance(XContentParser parser) { + return org.elasticsearch.client.transform.transforms.DataFrameIndexerPosition.fromXContent(parser); } @Override protected void assertInstances(DataFrameIndexerPosition serverTestInstance, - org.elasticsearch.client.dataframe.transforms.DataFrameIndexerPosition clientInstance) { + org.elasticsearch.client.transform.transforms.DataFrameIndexerPosition clientInstance) { assertThat(serverTestInstance.getIndexerPosition(), equalTo(clientInstance.getIndexerPosition())); assertThat(serverTestInstance.getBucketsPosition(), equalTo(clientInstance.getBucketsPosition())); } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerTransformStatsTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameIndexerTransformStatsTests.java similarity index 87% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerTransformStatsTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameIndexerTransformStatsTests.java index 9aa58105311..176e030dee8 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerTransformStatsTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameIndexerTransformStatsTests.java @@ -17,20 +17,20 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.hlrc; +package org.elasticsearch.client.transform.transforms.hlrc; -import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.client.AbstractHlrcXContentTestCase; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.common.xcontent.XContentParser; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; import java.io.IOException; public class DataFrameIndexerTransformStatsTests extends AbstractHlrcXContentTestCase< DataFrameIndexerTransformStats, - org.elasticsearch.client.dataframe.transforms.DataFrameIndexerTransformStats> { + org.elasticsearch.client.transform.transforms.DataFrameIndexerTransformStats> { public static DataFrameIndexerTransformStats fromHlrc( - org.elasticsearch.client.dataframe.transforms.DataFrameIndexerTransformStats instance) { + org.elasticsearch.client.transform.transforms.DataFrameIndexerTransformStats instance) { return new DataFrameIndexerTransformStats( instance.getNumPages(), instance.getNumDocuments(), @@ -48,14 +48,14 @@ public class DataFrameIndexerTransformStatsTests extends AbstractHlrcXContentTes } @Override - public org.elasticsearch.client.dataframe.transforms.DataFrameIndexerTransformStats doHlrcParseInstance(XContentParser parser) + public org.elasticsearch.client.transform.transforms.DataFrameIndexerTransformStats doHlrcParseInstance(XContentParser parser) throws IOException { - return org.elasticsearch.client.dataframe.transforms.DataFrameIndexerTransformStats.fromXContent(parser); + return org.elasticsearch.client.transform.transforms.DataFrameIndexerTransformStats.fromXContent(parser); } @Override public DataFrameIndexerTransformStats convertHlrcToInternal( - org.elasticsearch.client.dataframe.transforms.DataFrameIndexerTransformStats instance) { + org.elasticsearch.client.transform.transforms.DataFrameIndexerTransformStats instance) { return fromHlrc(instance); } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformCheckpointStatsTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformCheckpointStatsTests.java similarity index 88% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformCheckpointStatsTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformCheckpointStatsTests.java index 02bb3331bd5..d15fe99b099 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformCheckpointStatsTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformCheckpointStatsTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.hlrc; +package org.elasticsearch.client.transform.transforms.hlrc; import org.elasticsearch.client.AbstractResponseTestCase; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointStats; import java.io.IOException; @@ -30,10 +30,10 @@ import static org.hamcrest.Matchers.equalTo; public class DataFrameTransformCheckpointStatsTests extends AbstractResponseTestCase< DataFrameTransformCheckpointStats, - org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointStats> { + org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointStats> { public static DataFrameTransformCheckpointStats fromHlrc( - org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointStats instance) { + org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointStats instance) { return new DataFrameTransformCheckpointStats(instance.getCheckpoint(), DataFrameIndexerPositionTests.fromHlrc(instance.getPosition()), DataFrameTransformProgressTests.fromHlrc(instance.getCheckpointProgress()), @@ -54,14 +54,14 @@ public class DataFrameTransformCheckpointStatsTests extends AbstractResponseTest } @Override - protected org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointStats doParseToClientInstance(XContentParser parser) + protected org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointStats doParseToClientInstance(XContentParser parser) throws IOException { - return org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointStats.fromXContent(parser); + return org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointStats.fromXContent(parser); } @Override protected void assertInstances(DataFrameTransformCheckpointStats serverTestInstance, - org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointStats clientInstance) { + org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointStats clientInstance) { assertThat(serverTestInstance.getCheckpoint(), equalTo(clientInstance.getCheckpoint())); assertThat(serverTestInstance.getPosition().getBucketsPosition(), equalTo(clientInstance.getPosition().getBucketsPosition())); assertThat(serverTestInstance.getPosition().getIndexerPosition(), equalTo(clientInstance.getPosition().getIndexerPosition())); diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformCheckpointingInfoTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformCheckpointingInfoTests.java similarity index 87% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformCheckpointingInfoTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformCheckpointingInfoTests.java index d9cd95326e4..6df50e24236 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformCheckpointingInfoTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformCheckpointingInfoTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.hlrc; +package org.elasticsearch.client.transform.transforms.hlrc; -import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.client.AbstractHlrcXContentTestCase; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointingInfo; +import org.elasticsearch.common.xcontent.XContentParser; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointingInfo; import java.io.IOException; import java.time.Instant; @@ -29,10 +29,10 @@ import java.util.function.Predicate; public class DataFrameTransformCheckpointingInfoTests extends AbstractHlrcXContentTestCase< DataFrameTransformCheckpointingInfo, - org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointingInfo> { + org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointingInfo> { public static DataFrameTransformCheckpointingInfo fromHlrc( - org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointingInfo instance) { + org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointingInfo instance) { return new DataFrameTransformCheckpointingInfo( DataFrameTransformCheckpointStatsTests.fromHlrc(instance.getLast()), DataFrameTransformCheckpointStatsTests.fromHlrc(instance.getNext()), @@ -41,13 +41,13 @@ public class DataFrameTransformCheckpointingInfoTests extends AbstractHlrcXConte } @Override - public org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointingInfo doHlrcParseInstance(XContentParser parser) { - return org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointingInfo.fromXContent(parser); + public org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointingInfo doHlrcParseInstance(XContentParser parser) { + return org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointingInfo.fromXContent(parser); } @Override public DataFrameTransformCheckpointingInfo convertHlrcToInternal( - org.elasticsearch.client.dataframe.transforms.DataFrameTransformCheckpointingInfo instance) { + org.elasticsearch.client.transform.transforms.DataFrameTransformCheckpointingInfo instance) { return fromHlrc(instance); } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformProgressTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformProgressTests.java similarity index 84% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformProgressTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformProgressTests.java index 83858bb43cf..4b6349994be 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformProgressTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformProgressTests.java @@ -17,21 +17,21 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.hlrc; +package org.elasticsearch.client.transform.transforms.hlrc; import org.elasticsearch.client.AbstractResponseTestCase; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; import static org.hamcrest.Matchers.equalTo; public class DataFrameTransformProgressTests extends AbstractResponseTestCase< DataFrameTransformProgress, - org.elasticsearch.client.dataframe.transforms.DataFrameTransformProgress> { + org.elasticsearch.client.transform.transforms.DataFrameTransformProgress> { public static DataFrameTransformProgress fromHlrc( - org.elasticsearch.client.dataframe.transforms.DataFrameTransformProgress instance) { + org.elasticsearch.client.transform.transforms.DataFrameTransformProgress instance) { if (instance == null) { return null; } @@ -57,13 +57,13 @@ public class DataFrameTransformProgressTests extends AbstractResponseTestCase< } @Override - protected org.elasticsearch.client.dataframe.transforms.DataFrameTransformProgress doParseToClientInstance(XContentParser parser) { - return org.elasticsearch.client.dataframe.transforms.DataFrameTransformProgress.fromXContent(parser); + protected org.elasticsearch.client.transform.transforms.DataFrameTransformProgress doParseToClientInstance(XContentParser parser) { + return org.elasticsearch.client.transform.transforms.DataFrameTransformProgress.fromXContent(parser); } @Override protected void assertInstances(DataFrameTransformProgress serverTestInstance, - org.elasticsearch.client.dataframe.transforms.DataFrameTransformProgress clientInstance) { + org.elasticsearch.client.transform.transforms.DataFrameTransformProgress clientInstance) { assertThat(serverTestInstance.getTotalDocs(), equalTo(clientInstance.getTotalDocs())); assertThat(serverTestInstance.getDocumentsProcessed(), equalTo(clientInstance.getDocumentsProcessed())); assertThat(serverTestInstance.getPercentComplete(), equalTo(clientInstance.getPercentComplete())); diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformStatsTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformStatsTests.java similarity index 88% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformStatsTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformStatsTests.java index 42c22cbecc7..783896939f9 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformStatsTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/hlrc/DataFrameTransformStatsTests.java @@ -17,16 +17,16 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.hlrc; +package org.elasticsearch.client.transform.transforms.hlrc; import org.elasticsearch.client.AbstractHlrcXContentTestCase; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointingInfo; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.NodeAttributes; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointingInfo; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.NodeAttributes; import java.io.IOException; import java.time.Instant; @@ -35,9 +35,9 @@ import java.util.Map; import java.util.function.Predicate; public class DataFrameTransformStatsTests extends AbstractHlrcXContentTestCase { + org.elasticsearch.client.transform.transforms.DataFrameTransformStats> { - public static NodeAttributes fromHlrc(org.elasticsearch.client.dataframe.transforms.NodeAttributes attributes) { + public static NodeAttributes fromHlrc(org.elasticsearch.client.transform.transforms.NodeAttributes attributes) { return attributes == null ? null : new NodeAttributes(attributes.getId(), attributes.getName(), attributes.getEphemeralId(), @@ -46,7 +46,7 @@ public class DataFrameTransformStatsTests extends AbstractHlrcXContentTestCase { + extends AbstractResponseTestCase { - public static org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig randomTimeSyncConfig() { - return new org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig(randomAlphaOfLengthBetween(1, 10), + public static org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig randomTimeSyncConfig() { + return new org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig(randomAlphaOfLengthBetween(1, 10), new TimeValue(randomNonNegativeLong())); } - public static void assertHlrcEquals(org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig serverTestInstance, + public static void assertHlrcEquals(org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig serverTestInstance, TimeSyncConfig clientInstance) { assertEquals(serverTestInstance.getField(), clientInstance.getField()); assertEquals(serverTestInstance.getDelay(), clientInstance.getDelay()); } @Override - protected org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig createServerTestInstance(XContentType xContentType) { + protected org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig createServerTestInstance(XContentType xContentType) { return randomTimeSyncConfig(); } @@ -52,7 +52,7 @@ public class TimeSyncConfigTests } @Override - protected void assertInstances(org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig serverTestInstance, + protected void assertInstances(org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig serverTestInstance, TimeSyncConfig clientInstance) { assertHlrcEquals(serverTestInstance, clientInstance); } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/AggregationConfigTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/AggregationConfigTests.java similarity index 98% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/AggregationConfigTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/AggregationConfigTests.java index 210dc59329c..a6a1a7ffe4e 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/AggregationConfigTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/AggregationConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/DateHistogramGroupSourceTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/DateHistogramGroupSourceTests.java similarity index 97% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/DateHistogramGroupSourceTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/DateHistogramGroupSourceTests.java index ece1c4fb743..0723bcc8c90 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/DateHistogramGroupSourceTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/DateHistogramGroupSourceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/GroupConfigTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/GroupConfigTests.java similarity index 98% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/GroupConfigTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/GroupConfigTests.java index ab61f6abf48..f20fe098ecb 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/GroupConfigTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/GroupConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.DeprecationHandler; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/HistogramGroupSourceTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/HistogramGroupSourceTests.java similarity index 96% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/HistogramGroupSourceTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/HistogramGroupSourceTests.java index 18512c047a5..a10f7dde1bf 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/HistogramGroupSourceTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/HistogramGroupSourceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.AbstractXContentTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/PivotConfigTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/PivotConfigTests.java similarity index 97% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/PivotConfigTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/PivotConfigTests.java index 5cafcb9f419..43a24777826 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/PivotConfigTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/PivotConfigTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/TermsGroupSourceTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/TermsGroupSourceTests.java similarity index 96% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/TermsGroupSourceTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/TermsGroupSourceTests.java index 0a71566c22d..fdb264eeb31 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/TermsGroupSourceTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/TermsGroupSourceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot; +package org.elasticsearch.client.transform.transforms.pivot; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.AbstractXContentTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/hlrc/DateHistogramGroupSourceTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/hlrc/DateHistogramGroupSourceTests.java similarity index 87% rename from client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/hlrc/DateHistogramGroupSourceTests.java rename to client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/hlrc/DateHistogramGroupSourceTests.java index e9f01ae5278..682cec9c022 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/pivot/hlrc/DateHistogramGroupSourceTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/transform/transforms/pivot/hlrc/DateHistogramGroupSourceTests.java @@ -17,19 +17,19 @@ * under the License. */ -package org.elasticsearch.client.dataframe.transforms.pivot.hlrc; +package org.elasticsearch.client.transform.transforms.pivot.hlrc; import org.elasticsearch.client.AbstractResponseTestCase; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.DateHistogramGroupSource; +import org.elasticsearch.xpack.core.transform.transforms.pivot.DateHistogramGroupSource; import static org.hamcrest.Matchers.equalTo; public class DateHistogramGroupSourceTests extends AbstractResponseTestCase< DateHistogramGroupSource, - org.elasticsearch.client.dataframe.transforms.pivot.DateHistogramGroupSource> { + org.elasticsearch.client.transform.transforms.pivot.DateHistogramGroupSource> { public static DateHistogramGroupSource randomDateHistogramGroupSource() { String field = randomAlphaOfLengthBetween(1, 20); @@ -54,13 +54,13 @@ public class DateHistogramGroupSourceTests extends AbstractResponseTestCase< } @Override - protected org.elasticsearch.client.dataframe.transforms.pivot.DateHistogramGroupSource doParseToClientInstance(XContentParser parser) { - return org.elasticsearch.client.dataframe.transforms.pivot.DateHistogramGroupSource.fromXContent(parser); + protected org.elasticsearch.client.transform.transforms.pivot.DateHistogramGroupSource doParseToClientInstance(XContentParser parser) { + return org.elasticsearch.client.transform.transforms.pivot.DateHistogramGroupSource.fromXContent(parser); } @Override protected void assertInstances(DateHistogramGroupSource serverTestInstance, - org.elasticsearch.client.dataframe.transforms.pivot.DateHistogramGroupSource clientInstance) { + org.elasticsearch.client.transform.transforms.pivot.DateHistogramGroupSource clientInstance) { assertThat(serverTestInstance.getField(), equalTo(clientInstance.getField())); assertSameInterval(serverTestInstance.getInterval(), clientInstance.getInterval()); assertThat(serverTestInstance.getTimeZone(), equalTo(clientInstance.getTimeZone())); @@ -68,7 +68,7 @@ public class DateHistogramGroupSourceTests extends AbstractResponseTestCase< } private void assertSameInterval(DateHistogramGroupSource.Interval serverTestInstance, - org.elasticsearch.client.dataframe.transforms.pivot.DateHistogramGroupSource.Interval clientInstance) { + org.elasticsearch.client.transform.transforms.pivot.DateHistogramGroupSource.Interval clientInstance) { assertEquals(serverTestInstance.getName(), clientInstance.getName()); assertEquals(serverTestInstance.getInterval(), clientInstance.getInterval()); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java index e165d00da19..c9a4daeaee5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java @@ -41,20 +41,6 @@ import org.elasticsearch.xpack.core.action.XPackUsageAction; import org.elasticsearch.xpack.core.beats.BeatsFeatureSetUsage; import org.elasticsearch.xpack.core.ccr.AutoFollowMetadata; import org.elasticsearch.xpack.core.ccr.CCRFeatureSet; -import org.elasticsearch.xpack.core.dataframe.DataFrameFeatureSetUsage; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.DeleteDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsAction; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsStatsAction; -import org.elasticsearch.xpack.core.dataframe.action.PreviewDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.PutDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformTaskAction; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransform; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformState; -import org.elasticsearch.xpack.core.dataframe.transforms.SyncConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig; import org.elasticsearch.xpack.core.analytics.AnalyticsFeatureSetUsage; import org.elasticsearch.xpack.core.deprecation.DeprecationInfoAction; import org.elasticsearch.xpack.core.flattened.FlattenedFeatureSetUsage; @@ -215,6 +201,20 @@ import org.elasticsearch.xpack.core.spatial.SpatialFeatureSetUsage; import org.elasticsearch.xpack.core.sql.SqlFeatureSetUsage; import org.elasticsearch.xpack.core.ssl.SSLService; import org.elasticsearch.xpack.core.ssl.action.GetCertificateInfoAction; +import org.elasticsearch.xpack.core.transform.DataFrameFeatureSetUsage; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.DeleteDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsAction; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsStatsAction; +import org.elasticsearch.xpack.core.transform.action.PreviewDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.PutDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformTaskAction; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransform; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformState; +import org.elasticsearch.xpack.core.transform.transforms.SyncConfig; +import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig; import org.elasticsearch.xpack.core.upgrade.actions.IndexUpgradeAction; import org.elasticsearch.xpack.core.upgrade.actions.IndexUpgradeInfoAction; import org.elasticsearch.xpack.core.vectors.VectorsFeatureSetUsage; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameFeatureSetUsage.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameFeatureSetUsage.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameFeatureSetUsage.java index 481a367fcf3..9d0c249e59a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameFeatureSetUsage.java @@ -4,15 +4,15 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe; +package org.elasticsearch.xpack.core.transform; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.xpack.core.XPackFeatureSet.Usage; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; import org.elasticsearch.xpack.core.XPackField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; import java.io.IOException; import java.util.Map; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameField.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameField.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameField.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameField.java index 56867ee9029..4c826ac1dad 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameField.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameField.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe; +package org.elasticsearch.xpack.core.transform; import org.elasticsearch.common.ParseField; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameMessages.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameMessages.java similarity index 99% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameMessages.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameMessages.java index 32f639a1fac..e3326931b56 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameMessages.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameMessages.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe; +package org.elasticsearch.xpack.core.transform; import java.text.MessageFormat; import java.util.Locale; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameNamedXContentProvider.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameNamedXContentProvider.java similarity index 82% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameNamedXContentProvider.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameNamedXContentProvider.java index 9eacfc5ff1e..59368680ce4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/DataFrameNamedXContentProvider.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/DataFrameNamedXContentProvider.java @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe; +package org.elasticsearch.xpack.core.transform; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.plugins.spi.NamedXContentProvider; -import org.elasticsearch.xpack.core.dataframe.transforms.SyncConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig; +import org.elasticsearch.xpack.core.transform.transforms.SyncConfig; +import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig; import java.util.Arrays; import java.util.List; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/DeleteDataFrameTransformAction.java similarity index 93% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/DeleteDataFrameTransformAction.java index 19e2cd77704..6897d733ff9 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/DeleteDataFrameTransformAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; @@ -12,8 +12,8 @@ import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.Objects; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsAction.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsAction.java index 93e9dcaf355..f2e456b9498 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.apache.logging.log4j.LogManager; import org.elasticsearch.action.ActionType; @@ -19,8 +19,8 @@ import org.elasticsearch.xpack.core.action.AbstractGetResourcesRequest; import org.elasticsearch.xpack.core.action.AbstractGetResourcesResponse; import org.elasticsearch.xpack.core.action.util.PageParams; import org.elasticsearch.xpack.core.action.util.QueryPage; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; import java.io.IOException; import java.util.ArrayList; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsStatsAction.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsStatsAction.java index 00170df7b15..0b768e1a159 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsStatsAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.Version; @@ -22,9 +22,9 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.tasks.Task; import org.elasticsearch.xpack.core.action.util.PageParams; import org.elasticsearch.xpack.core.action.util.QueryPage; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStats; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStats; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.ArrayList; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformAction.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformAction.java index d30db53746f..3ba4c4115d8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; @@ -22,9 +22,9 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DestConfig; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DestConfig; import java.io.IOException; import java.util.ArrayList; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PutDataFrameTransformAction.java similarity index 95% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PutDataFrameTransformAction.java index 29888046644..440002ae580 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PutDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; @@ -16,10 +16,10 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.indices.InvalidIndexNameException; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.utils.DataFrameStrings; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.utils.DataFrameStrings; import java.io.IOException; import java.util.Locale; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformAction.java similarity index 95% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformAction.java index 7473193e439..e91612b3ae7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; @@ -14,8 +14,8 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.Collections; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformTaskAction.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformTaskAction.java index 4fe87d9727f..da8c5a27423 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformTaskAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; @@ -16,8 +16,8 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.tasks.Task; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.Collections; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StopDataFrameTransformAction.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StopDataFrameTransformAction.java index eef244551a3..8edd951e12d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/StopDataFrameTransformAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.Version; @@ -20,8 +20,8 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.tasks.Task; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.Arrays; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/UpdateDataFrameTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateDataFrameTransformAction.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/UpdateDataFrameTransformAction.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateDataFrameTransformAction.java index 4136f89ce06..5218d2f2911 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/UpdateDataFrameTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; @@ -17,9 +17,9 @@ import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.indices.InvalidIndexNameException; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigUpdate; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigUpdate; import java.io.IOException; import java.util.Locale; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/notifications/DataFrameAuditMessage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/notifications/DataFrameAuditMessage.java similarity index 90% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/notifications/DataFrameAuditMessage.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/notifications/DataFrameAuditMessage.java index 47fa357fb85..0bb6c556ac1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/notifications/DataFrameAuditMessage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/notifications/DataFrameAuditMessage.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.notifications; +package org.elasticsearch.xpack.core.transform.notifications; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.xpack.core.common.notifications.AbstractAuditMessage; import org.elasticsearch.xpack.core.common.notifications.Level; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.util.Date; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerPosition.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerPosition.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerPosition.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerPosition.java index 84d3a655593..8bb3e93410a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerPosition.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerPosition.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerTransformStats.java similarity index 99% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStats.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerTransformStats.java index 67d8ab5f6ce..c1883d53eb5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerTransformStats.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransform.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransform.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransform.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransform.java index 9fae4816227..0a0e99eb24e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransform.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransform.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.cluster.AbstractDiffable; @@ -16,7 +16,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.xpack.core.XPackPlugin; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.io.IOException; import java.util.Objects; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpoint.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpoint.java similarity index 99% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpoint.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpoint.java index 69877c4cbe7..6fe27d266fa 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpoint.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpoint.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; @@ -16,7 +16,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.io.IOException; import java.util.Arrays; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointStats.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointStats.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointStats.java index 5a19bfd3000..416467750bf 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointStats.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; @@ -14,7 +14,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.io.IOException; import java.util.Objects; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointingInfo.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointingInfo.java similarity index 99% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointingInfo.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointingInfo.java index 004f89f977d..50679861374 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointingInfo.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointingInfo.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfig.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfig.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfig.java index 62865f5e1e5..6f63c813d2d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfig.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.cluster.AbstractDiffable; @@ -22,10 +22,10 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParserUtils; import org.elasticsearch.xpack.core.common.time.TimeUtils; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfig; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.time.Instant; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfigUpdate.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfigUpdate.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfigUpdate.java index cab92beb315..b7d8d0861ac 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfigUpdate.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.Version; @@ -20,15 +20,15 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParserUtils; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; import java.io.IOException; import java.util.Map; import java.util.Objects; import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; -import static org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig.MAX_DESCRIPTION_LENGTH; +import static org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig.MAX_DESCRIPTION_LENGTH; /** * This class holds the mutable configuration items for a data frame transform diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformProgress.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformProgress.java similarity index 99% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformProgress.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformProgress.java index d7e409f4a52..0930bec2c96 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformProgress.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformProgress.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformState.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformState.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformState.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformState.java index 6cc058e5acd..f47b77194ec 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformState.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformState.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.Nullable; @@ -18,8 +18,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.persistent.PersistentTaskState; import org.elasticsearch.tasks.Task; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; import org.elasticsearch.xpack.core.indexing.IndexerState; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.io.IOException; import java.util.Map; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStats.java similarity index 99% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStats.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStats.java index 6b58374925b..489998d460b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStats.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.Nullable; @@ -19,8 +19,8 @@ import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; import org.elasticsearch.xpack.core.indexing.IndexerState; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.io.IOException; import java.util.Locale; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDoc.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStoredDoc.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDoc.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStoredDoc.java index 8fa7000a659..4c3f8489364 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDoc.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStoredDoc.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; @@ -16,7 +16,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.io.IOException; import java.util.Objects; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformTaskState.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformTaskState.java similarity index 94% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformTaskState.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformTaskState.java index 795daca61ac..a553ed26a8e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformTaskState.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformTaskState.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DestConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DestConfig.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DestConfig.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DestConfig.java index 00d03066b6f..6d54685a402 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DestConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/DestConfig.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; @@ -15,7 +15,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.Objects; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/NodeAttributes.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/NodeAttributes.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/NodeAttributes.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/NodeAttributes.java index 76b40bd2377..1283db2f67f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/NodeAttributes.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/NodeAttributes.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.ParseField; @@ -15,7 +15,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.Collections; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/QueryConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfig.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/QueryConfig.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfig.java index 981a56e639d..bfd2a5a96eb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/QueryConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfig.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.query.AbstractQueryBuilder; import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; import java.io.IOException; import java.util.Collections; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/SourceConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/SourceConfig.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java index 19671fd552c..b59a7912cf7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/SourceConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; @@ -15,7 +15,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.Arrays; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/SyncConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SyncConfig.java similarity index 93% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/SyncConfig.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SyncConfig.java index 19ff79ea7e0..0840cb4f537 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/SyncConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SyncConfig.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.NamedWriteable; import org.elasticsearch.common.xcontent.ToXContentObject; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/TimeSyncConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TimeSyncConfig.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/TimeSyncConfig.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TimeSyncConfig.java index 607d48b741f..ed9d2ba2089 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/TimeSyncConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TimeSyncConfig.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -16,8 +16,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.RangeQueryBuilder; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.io.IOException; import java.util.Objects; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/AggregationConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfig.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/AggregationConfig.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfig.java index 4942f335eee..e99abc0b02c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/AggregationConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfig.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -22,7 +22,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.PipelineAggregationBuilder; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; import java.io.IOException; import java.util.Collection; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/DateHistogramGroupSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java similarity index 99% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/DateHistogramGroupSource.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java index 3b856f454c4..c307b9e2a74 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/DateHistogramGroupSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSource.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/GroupConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfig.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/GroupConfig.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfig.java index 532477c44bd..d7256c98f85 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/GroupConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfig.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -21,9 +21,9 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.search.aggregations.AggregatorFactories; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.LinkedHashMap; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/HistogramGroupSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSource.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/HistogramGroupSource.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSource.java index 372f4ad99b6..490096d319b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/HistogramGroupSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSource.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/PivotConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/PivotConfig.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/PivotConfig.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/PivotConfig.java index 038299bfd83..8cdef9fd421 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/PivotConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/PivotConfig.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; @@ -17,8 +17,8 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.PipelineAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; import java.io.IOException; import java.util.ArrayList; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/SingleGroupSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/SingleGroupSource.java similarity index 98% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/SingleGroupSource.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/SingleGroupSource.java index ff1f9c3d54a..557b7e3f612 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/SingleGroupSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/SingleGroupSource.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/TermsGroupSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSource.java similarity index 97% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/TermsGroupSource.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSource.java index 891b160da07..e07ff611175 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/TermsGroupSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSource.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/utils/DataFrameStrings.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/utils/DataFrameStrings.java similarity index 96% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/utils/DataFrameStrings.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/utils/DataFrameStrings.java index 22dd3526a24..e2614f37433 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/utils/DataFrameStrings.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/utils/DataFrameStrings.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.utils; +package org.elasticsearch.xpack.core.transform.utils; import org.elasticsearch.cluster.metadata.MetaData; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/utils/ExceptionsHelper.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/utils/ExceptionsHelper.java similarity index 92% rename from x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/utils/ExceptionsHelper.java rename to x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/utils/ExceptionsHelper.java index 8bfd558b209..4c0f1e12869 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/utils/ExceptionsHelper.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/utils/ExceptionsHelper.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.utils; +package org.elasticsearch.xpack.core.transform.utils; /** * Collection of methods to aid in creating and checking for exceptions. diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java index ecedfc0c0e9..2f7c067fe5d 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java @@ -49,13 +49,6 @@ import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.transport.TransportRequest; import org.elasticsearch.xpack.core.action.XPackInfoAction; -import org.elasticsearch.xpack.core.dataframe.action.DeleteDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsAction; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsStatsAction; -import org.elasticsearch.xpack.core.dataframe.action.PreviewDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.PutDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction; import org.elasticsearch.xpack.core.ml.MlMetaIndex; import org.elasticsearch.xpack.core.ml.action.CloseJobAction; import org.elasticsearch.xpack.core.ml.action.DeleteCalendarAction; @@ -139,6 +132,13 @@ import org.elasticsearch.xpack.core.security.user.LogstashSystemUser; import org.elasticsearch.xpack.core.security.user.RemoteMonitoringUser; import org.elasticsearch.xpack.core.security.user.SystemUser; import org.elasticsearch.xpack.core.security.user.XPackUser; +import org.elasticsearch.xpack.core.transform.action.DeleteDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsAction; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsStatsAction; +import org.elasticsearch.xpack.core.transform.action.PreviewDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.PutDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction; import org.elasticsearch.xpack.core.watcher.execution.TriggeredWatchStoreField; import org.elasticsearch.xpack.core.watcher.history.HistoryStoreField; import org.elasticsearch.xpack.core.watcher.transport.actions.ack.AckWatchAction; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/DataFrameFeatureSetUsageTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/DataFrameFeatureSetUsageTests.java similarity index 91% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/DataFrameFeatureSetUsageTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/DataFrameFeatureSetUsageTests.java index 13dd2db0a4b..1744f3234b5 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/DataFrameFeatureSetUsageTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/DataFrameFeatureSetUsageTests.java @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe; +package org.elasticsearch.xpack.core.transform; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStatsTests; import org.elasticsearch.xpack.core.indexing.IndexerState; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStatsTests; import java.util.HashMap; import java.util.Map; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/DataFrameMessagesTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/DataFrameMessagesTests.java similarity index 98% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/DataFrameMessagesTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/DataFrameMessagesTests.java index b6284af6c58..b7aa369eb5e 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/DataFrameMessagesTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/DataFrameMessagesTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe; +package org.elasticsearch.xpack.core.transform; import org.elasticsearch.test.ESTestCase; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/AbstractSerializingDataFrameTestCase.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/AbstractSerializingDataFrameTestCase.java similarity index 86% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/AbstractSerializingDataFrameTestCase.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/AbstractSerializingDataFrameTestCase.java index 14cbdef148c..df4b6060ee4 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/AbstractSerializingDataFrameTestCase.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/AbstractSerializingDataFrameTestCase.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.Writeable; @@ -13,10 +13,10 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.search.SearchModule; import org.elasticsearch.test.AbstractSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameNamedXContentProvider; -import org.elasticsearch.xpack.core.dataframe.transforms.SyncConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameNamedXContentProvider; +import org.elasticsearch.xpack.core.transform.transforms.SyncConfig; +import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig; import org.junit.Before; import java.util.List; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/AbstractWireSerializingDataFrameTestCase.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/AbstractWireSerializingDataFrameTestCase.java similarity index 86% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/AbstractWireSerializingDataFrameTestCase.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/AbstractWireSerializingDataFrameTestCase.java index 47d7860b71d..f3389087813 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/AbstractWireSerializingDataFrameTestCase.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/AbstractWireSerializingDataFrameTestCase.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.Writeable; @@ -12,10 +12,10 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.search.SearchModule; import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameNamedXContentProvider; -import org.elasticsearch.xpack.core.dataframe.transforms.SyncConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameNamedXContentProvider; +import org.elasticsearch.xpack.core.transform.transforms.SyncConfig; +import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig; import org.junit.Before; import java.util.List; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/DeleteDataFrameTransformActionRequestTests.java similarity index 86% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformActionRequestTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/DeleteDataFrameTransformActionRequestTests.java index e1b2c338acb..d165abfbdc1 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/DeleteDataFrameTransformActionRequestTests.java @@ -4,11 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.action.DeleteDataFrameTransformAction.Request; +import org.elasticsearch.xpack.core.transform.action.DeleteDataFrameTransformAction.Request; public class DeleteDataFrameTransformActionRequestTests extends AbstractWireSerializingTestCase { @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsActionRequestTests.java similarity index 87% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsActionRequestTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsActionRequestTests.java index 85413d89078..8d8519aa903 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsActionRequestTests.java @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsAction.Request; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsAction.Request; public class GetDataFrameTransformsActionRequestTests extends AbstractWireSerializingTestCase { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsActionResponseTests.java similarity index 94% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsActionResponseTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsActionResponseTests.java index 4a63ff787ff..baaecc18af3 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsActionResponseTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.logging.LoggerMessageFormat; @@ -12,9 +12,9 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsAction.Response; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsAction.Response; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigTests; import org.elasticsearch.xpack.core.watcher.watch.Payload.XContent; import java.io.IOException; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsStatsActionRequestTests.java similarity index 88% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsActionRequestTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsStatsActionRequestTests.java index 3e002688b88..93c75428ec4 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsStatsActionRequestTests.java @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsStatsAction.Request; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsStatsAction.Request; public class GetDataFrameTransformsStatsActionRequestTests extends AbstractWireSerializingTestCase { @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsStatsActionResponseTests.java similarity index 87% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsActionResponseTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsStatsActionResponseTests.java index 007401a4db8..451ba099b51 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/GetDataFrameTransformsStatsActionResponseTests.java @@ -4,15 +4,15 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.FailedNodeException; import org.elasticsearch.action.TaskOperationFailure; import org.elasticsearch.common.io.stream.Writeable.Reader; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsStatsAction.Response; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStatsTests; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsStatsAction.Response; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStatsTests; import java.util.ArrayList; import java.util.List; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformActionRequestTests.java similarity index 86% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformActionRequestTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformActionRequestTests.java index 5eaf9552492..9f92ac85662 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformActionRequestTests.java @@ -4,22 +4,22 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.xpack.core.dataframe.action.PreviewDataFrameTransformAction.Request; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigTests; -import org.elasticsearch.xpack.core.dataframe.transforms.DestConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfigTests; +import org.elasticsearch.xpack.core.transform.action.PreviewDataFrameTransformAction.Request; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.DestConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfigTests; import java.io.IOException; -import static org.elasticsearch.xpack.core.dataframe.transforms.SourceConfigTests.randomSourceConfig; +import static org.elasticsearch.xpack.core.transform.transforms.SourceConfigTests.randomSourceConfig; public class PreviewDataFrameTransformActionRequestTests extends AbstractSerializingDataFrameTestCase { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformsActionResponseTests.java similarity index 94% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformsActionResponseTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformsActionResponseTests.java index 2e29c737027..3a4c2e98b23 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformsActionResponseTests.java @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.AbstractSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.action.PreviewDataFrameTransformAction.Response; +import org.elasticsearch.xpack.core.transform.action.PreviewDataFrameTransformAction.Response; import java.io.IOException; import java.util.ArrayList; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformsActionResponseWireTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformsActionResponseWireTests.java similarity index 90% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformsActionResponseWireTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformsActionResponseWireTests.java index df4fe1c14b9..d146c60d12a 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformsActionResponseWireTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PreviewDataFrameTransformsActionResponseWireTests.java @@ -4,10 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable.Reader; -import org.elasticsearch.xpack.core.dataframe.action.PreviewDataFrameTransformAction.Response; +import org.elasticsearch.xpack.core.transform.action.PreviewDataFrameTransformAction.Response; import java.util.ArrayList; import java.util.HashMap; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PutDataFrameTransformActionRequestTests.java similarity index 80% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformActionRequestTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PutDataFrameTransformActionRequestTests.java index 757a0e44b74..72113be7fac 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/PutDataFrameTransformActionRequestTests.java @@ -4,19 +4,19 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.SearchModule; import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.PutDataFrameTransformAction.Request; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigTests; -import org.elasticsearch.xpack.core.dataframe.transforms.SyncConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.PutDataFrameTransformAction.Request; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.SyncConfig; +import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig; import org.junit.Before; import java.util.List; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformActionRequestTests.java similarity index 86% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformActionRequestTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformActionRequestTests.java index 6220a08fb10..2a70acfef81 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformActionRequestTests.java @@ -4,11 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformAction.Request; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformAction.Request; public class StartDataFrameTransformActionRequestTests extends AbstractWireSerializingTestCase { @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformActionResponseTests.java similarity index 84% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformActionResponseTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformActionResponseTests.java index d2cd377ffba..5ecf0999b5a 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformActionResponseTests.java @@ -4,10 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable.Reader; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformAction.Response; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformAction.Response; public class StartDataFrameTransformActionResponseTests extends AbstractWireSerializingDataFrameTestCase { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformTaskActionRequestTests.java similarity index 94% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskActionRequestTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformTaskActionRequestTests.java index b6fb6b94d54..7c28772276f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformTaskActionRequestTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractWireSerializingTestCase; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformTaskActionResponseTests.java similarity index 94% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskActionResponseTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformTaskActionResponseTests.java index 62165f87968..fbf42f8e144 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StartDataFrameTransformTaskActionResponseTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractWireSerializingTestCase; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StopDataFrameTransformActionRequestTests.java similarity index 93% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformActionRequestTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StopDataFrameTransformActionRequestTests.java index 7ad89094b19..b21f5ebbd3f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StopDataFrameTransformActionRequestTests.java @@ -4,15 +4,15 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.tasks.Task; import org.elasticsearch.tasks.TaskId; import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction.Request; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction.Request; import java.util.Arrays; import java.util.Collections; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StopDataFrameTransformActionResponseTests.java similarity index 84% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformActionResponseTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StopDataFrameTransformActionResponseTests.java index afd5b6fa2db..872bd9952fa 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/StopDataFrameTransformActionResponseTests.java @@ -4,10 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable.Reader; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction.Response; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction.Response; public class StopDataFrameTransformActionResponseTests extends AbstractWireSerializingDataFrameTestCase { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/UpdateDataFrameTransformActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/UpdateDataFrameTransformActionRequestTests.java similarity index 81% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/UpdateDataFrameTransformActionRequestTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/UpdateDataFrameTransformActionRequestTests.java index 3aa34dae067..e26d62186c5 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/UpdateDataFrameTransformActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/UpdateDataFrameTransformActionRequestTests.java @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable; -import org.elasticsearch.xpack.core.dataframe.action.UpdateDataFrameTransformAction.Request; +import org.elasticsearch.xpack.core.transform.action.UpdateDataFrameTransformAction.Request; -import static org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigUpdateTests.randomDataFrameTransformConfigUpdate; +import static org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigUpdateTests.randomDataFrameTransformConfigUpdate; public class UpdateDataFrameTransformActionRequestTests extends AbstractWireSerializingDataFrameTestCase { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/UpdateDataFrameTransformsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/UpdateDataFrameTransformsActionResponseTests.java similarity index 80% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/UpdateDataFrameTransformsActionResponseTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/UpdateDataFrameTransformsActionResponseTests.java index 6dffbc89302..a7208889a3a 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/UpdateDataFrameTransformsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/action/UpdateDataFrameTransformsActionResponseTests.java @@ -4,13 +4,13 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.action; +package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.action.UpdateDataFrameTransformAction.Response; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.xpack.core.transform.action.UpdateDataFrameTransformAction.Response; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigTests; import java.io.IOException; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/notifications/DataFrameAuditMessageTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/notifications/DataFrameAuditMessageTests.java similarity index 95% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/notifications/DataFrameAuditMessageTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/notifications/DataFrameAuditMessageTests.java index a76310bec2a..4da7d958673 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/notifications/DataFrameAuditMessageTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/notifications/DataFrameAuditMessageTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.notifications; +package org.elasticsearch.xpack.core.transform.notifications; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.AbstractXContentTestCase; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/AbstractSerializingDataFrameTestCase.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/AbstractSerializingDataFrameTestCase.java similarity index 94% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/AbstractSerializingDataFrameTestCase.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/AbstractSerializingDataFrameTestCase.java index 79edb808455..e95fc86d2e4 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/AbstractSerializingDataFrameTestCase.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/AbstractSerializingDataFrameTestCase.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -18,8 +18,8 @@ import org.elasticsearch.search.SearchModule; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.BaseAggregationBuilder; import org.elasticsearch.test.AbstractSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameNamedXContentProvider; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameNamedXContentProvider; import org.junit.Before; import java.util.Collections; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerPositionTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerPositionTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerPositionTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerPositionTests.java index dd57a0302a4..11538e250bd 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerPositionTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerPositionTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStatsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerTransformStatsTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStatsTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerTransformStatsTests.java index 3313ae8d145..9db8eb061cf 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStatsTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameIndexerTransformStatsTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointStatsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointStatsTests.java similarity index 96% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointStatsTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointStatsTests.java index 4145d773eee..7759ade94ce 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointStatsTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointStatsTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointTests.java similarity index 99% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointTests.java index 298b018ce45..0dd4f4f777d 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.Writeable.Reader; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointingInfoTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointingInfoTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointingInfoTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointingInfoTests.java index 18ccc142bd6..5feaf2aec02 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformCheckpointingInfoTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformCheckpointingInfoTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfigTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfigTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfigTests.java index 849ff1629c7..6a45e983281 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfigTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; @@ -16,7 +16,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfigTests; import org.junit.Before; import java.io.IOException; @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.Map; import static org.elasticsearch.test.TestMatchers.matchesPattern; -import static org.elasticsearch.xpack.core.dataframe.transforms.DestConfigTests.randomDestConfig; -import static org.elasticsearch.xpack.core.dataframe.transforms.SourceConfigTests.randomInvalidSourceConfig; -import static org.elasticsearch.xpack.core.dataframe.transforms.SourceConfigTests.randomSourceConfig; +import static org.elasticsearch.xpack.core.transform.transforms.DestConfigTests.randomDestConfig; +import static org.elasticsearch.xpack.core.transform.transforms.SourceConfigTests.randomInvalidSourceConfig; +import static org.elasticsearch.xpack.core.transform.transforms.SourceConfigTests.randomSourceConfig; import static org.hamcrest.Matchers.equalTo; public class DataFrameTransformConfigTests extends AbstractSerializingDataFrameTestCase { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfigUpdateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfigUpdateTests.java similarity index 96% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfigUpdateTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfigUpdateTests.java index 1cc7574be19..890117402c0 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformConfigUpdateTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformConfigUpdateTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.Version; @@ -14,16 +14,16 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfigTests; import java.io.IOException; import java.time.Instant; import java.util.Collections; import java.util.Map; -import static org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigTests.randomDataFrameTransformConfig; -import static org.elasticsearch.xpack.core.dataframe.transforms.DestConfigTests.randomDestConfig; -import static org.elasticsearch.xpack.core.dataframe.transforms.SourceConfigTests.randomSourceConfig; +import static org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigTests.randomDataFrameTransformConfig; +import static org.elasticsearch.xpack.core.transform.transforms.DestConfigTests.randomDestConfig; +import static org.elasticsearch.xpack.core.transform.transforms.SourceConfigTests.randomSourceConfig; import static org.hamcrest.Matchers.equalTo; public class DataFrameTransformConfigUpdateTests extends AbstractSerializingDataFrameTestCase { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformProgressTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformProgressTests.java similarity index 98% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformProgressTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformProgressTests.java index ccd61a6dd44..5980cd504e9 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformProgressTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformProgressTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStateTests.java similarity index 91% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStateTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStateTests.java index cc6fe88e5b2..0d3fd13eb80 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStateTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStateTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; @@ -14,8 +14,8 @@ import org.elasticsearch.xpack.core.indexing.IndexerState; import java.io.IOException; import java.util.function.Predicate; -import static org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgressTests.randomDataFrameTransformProgress; -import static org.elasticsearch.xpack.core.dataframe.transforms.NodeAttributeTests.randomNodeAttributes; +import static org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgressTests.randomDataFrameTransformProgress; +import static org.elasticsearch.xpack.core.transform.transforms.NodeAttributeTests.randomNodeAttributes; public class DataFrameTransformStateTests extends AbstractSerializingTestCase { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStatsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStatsTests.java similarity index 96% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStatsTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStatsTests.java index f438d6cfcf6..ed7c68552cc 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStatsTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStatsTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDocTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStoredDocTests.java similarity index 94% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDocTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStoredDocTests.java index 3466adf51a1..b820af3038f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDocTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformStoredDocTests.java @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.io.IOException; import java.util.Collections; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformTaskStateTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformTaskStateTests.java similarity index 98% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformTaskStateTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformTaskStateTests.java index 62c73846f59..2346a07992a 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformTaskStateTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformTaskStateTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformTests.java index ce830240c63..81c0ca60d5b 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DataFrameTransformTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DestConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DestConfigTests.java similarity index 95% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DestConfigTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DestConfigTests.java index 094267ba4ad..907ff14c401 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DestConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/DestConfigTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/MockDeprecatedAggregationBuilder.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/MockDeprecatedAggregationBuilder.java similarity index 98% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/MockDeprecatedAggregationBuilder.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/MockDeprecatedAggregationBuilder.java index fd7fe91db98..ea4e28976e4 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/MockDeprecatedAggregationBuilder.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/MockDeprecatedAggregationBuilder.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.apache.logging.log4j.LogManager; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/MockDeprecatedQueryBuilder.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/MockDeprecatedQueryBuilder.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/MockDeprecatedQueryBuilder.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/MockDeprecatedQueryBuilder.java index 147c72d2cb7..71235409145 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/MockDeprecatedQueryBuilder.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/MockDeprecatedQueryBuilder.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.apache.logging.log4j.LogManager; import org.apache.lucene.search.Query; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/NodeAttributeTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/NodeAttributeTests.java similarity index 96% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/NodeAttributeTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/NodeAttributeTests.java index fdc7692c412..15daf281757 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/NodeAttributeTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/NodeAttributeTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/QueryConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfigTests.java similarity index 98% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/QueryConfigTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfigTests.java index b967dcf06e8..34f67483b4a 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/QueryConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfigTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.bytes.BytesReference; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/SourceConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfigTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/SourceConfigTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfigTests.java index b8eee446f37..8abec618e64 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/SourceConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfigTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/TimeSyncConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TimeSyncConfigTests.java similarity index 91% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/TimeSyncConfigTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TimeSyncConfigTests.java index f6775712c12..a9c18bed7e9 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/TimeSyncConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TimeSyncConfigTests.java @@ -4,13 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms; +package org.elasticsearch.xpack.core.transform.transforms; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.AbstractSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig; import java.io.IOException; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/AggregationConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfigTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/AggregationConfigTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfigTests.java index c4b69c72ac6..56485211577 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/AggregationConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfigTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.Writeable.Reader; @@ -19,8 +19,8 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregatorFactories; -import org.elasticsearch.xpack.core.dataframe.transforms.AbstractSerializingDataFrameTestCase; -import org.elasticsearch.xpack.core.dataframe.transforms.MockDeprecatedAggregationBuilder; +import org.elasticsearch.xpack.core.transform.transforms.AbstractSerializingDataFrameTestCase; +import org.elasticsearch.xpack.core.transform.transforms.MockDeprecatedAggregationBuilder; import org.junit.Before; import java.io.IOException; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/DateHistogramGroupSourceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSourceTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/DateHistogramGroupSourceTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSourceTests.java index b28cf603030..0628ae8ae7e 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/DateHistogramGroupSourceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/DateHistogramGroupSourceTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/GroupConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfigTests.java similarity index 97% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/GroupConfigTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfigTests.java index 11dfc55264a..6f999878bc7 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/GroupConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfigTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.bytes.BytesReference; @@ -17,7 +17,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.AbstractSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.SingleGroupSource.Type; +import org.elasticsearch.xpack.core.transform.transforms.pivot.SingleGroupSource.Type; import java.io.IOException; import java.util.Collections; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/HistogramGroupSourceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSourceTests.java similarity index 95% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/HistogramGroupSourceTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSourceTests.java index 7035376c749..fd0baf3a5d7 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/HistogramGroupSourceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/HistogramGroupSourceTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/PivotConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/PivotConfigTests.java similarity index 98% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/PivotConfigTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/PivotConfigTests.java index 2f93f50d4d1..d1990af5dc1 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/PivotConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/PivotConfigTests.java @@ -4,14 +4,14 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.xpack.core.dataframe.transforms.AbstractSerializingDataFrameTestCase; +import org.elasticsearch.xpack.core.transform.transforms.AbstractSerializingDataFrameTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/TermsGroupSourceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSourceTests.java similarity index 94% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/TermsGroupSourceTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSourceTests.java index d41d68e4acc..60c973b3039 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/pivot/TermsGroupSourceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/pivot/TermsGroupSourceTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.transforms.pivot; +package org.elasticsearch.xpack.core.transform.transforms.pivot; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/utils/DataFrameStringsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/utils/DataFrameStringsTests.java similarity index 95% rename from x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/utils/DataFrameStringsTests.java rename to x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/utils/DataFrameStringsTests.java index 2e3f3f13124..51f95687df2 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/utils/DataFrameStringsTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/utils/DataFrameStringsTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.core.dataframe.utils; +package org.elasticsearch.xpack.core.transform.utils; import org.elasticsearch.test.ESTestCase; diff --git a/x-pack/plugin/data-frame/build.gradle b/x-pack/plugin/transform/build.gradle similarity index 87% rename from x-pack/plugin/data-frame/build.gradle rename to x-pack/plugin/transform/build.gradle index 03c89994e97..bc012450ec7 100644 --- a/x-pack/plugin/data-frame/build.gradle +++ b/x-pack/plugin/transform/build.gradle @@ -2,9 +2,9 @@ evaluationDependsOn(xpackModule('core')) apply plugin: 'elasticsearch.esplugin' esplugin { - name 'data-frame' - description 'A plugin to build data frames' - classname 'org.elasticsearch.xpack.dataframe.DataFrame' + name 'transform' + description 'A plugin to transform data' + classname 'org.elasticsearch.xpack.transform.DataFrame' extendedPlugins = ['x-pack-core'] } diff --git a/x-pack/plugin/data-frame/qa/build.gradle b/x-pack/plugin/transform/qa/build.gradle similarity index 100% rename from x-pack/plugin/data-frame/qa/build.gradle rename to x-pack/plugin/transform/qa/build.gradle diff --git a/x-pack/plugin/data-frame/qa/multi-node-tests/build.gradle b/x-pack/plugin/transform/qa/multi-node-tests/build.gradle similarity index 96% rename from x-pack/plugin/data-frame/qa/multi-node-tests/build.gradle rename to x-pack/plugin/transform/qa/multi-node-tests/build.gradle index fe394adfc97..cec942efa84 100644 --- a/x-pack/plugin/data-frame/qa/multi-node-tests/build.gradle +++ b/x-pack/plugin/transform/qa/multi-node-tests/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.rest-test' dependencies { testCompile project(path: xpackModule('core'), configuration: 'default') testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') - testCompile project(path: xpackModule('data-frame'), configuration: 'runtime') + testCompile project(path: xpackModule('transform'), configuration: 'runtime') testCompile project(':client:rest-high-level') } diff --git a/x-pack/plugin/data-frame/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameIntegTestCase.java b/x-pack/plugin/transform/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameIntegTestCase.java similarity index 92% rename from x-pack/plugin/data-frame/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameIntegTestCase.java rename to x-pack/plugin/transform/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameIntegTestCase.java index 4c6723de29c..e1efaa10d84 100644 --- a/x-pack/plugin/data-frame/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameIntegTestCase.java +++ b/x-pack/plugin/transform/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameIntegTestCase.java @@ -14,29 +14,29 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.core.AcknowledgedResponse; -import org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsResponse; -import org.elasticsearch.client.dataframe.PutDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StartDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.StopDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.StopDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate; -import org.elasticsearch.client.dataframe.transforms.DestConfig; -import org.elasticsearch.client.dataframe.transforms.QueryConfig; -import org.elasticsearch.client.dataframe.transforms.SourceConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.AggregationConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.DateHistogramGroupSource; -import org.elasticsearch.client.dataframe.transforms.pivot.GroupConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.PivotConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.SingleGroupSource; import org.elasticsearch.client.indices.CreateIndexRequest; import org.elasticsearch.client.indices.CreateIndexResponse; +import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformResponse; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsResponse; +import org.elasticsearch.client.transform.PutDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformRequest; +import org.elasticsearch.client.transform.StartDataFrameTransformResponse; +import org.elasticsearch.client.transform.StopDataFrameTransformRequest; +import org.elasticsearch.client.transform.StopDataFrameTransformResponse; +import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate; +import org.elasticsearch.client.transform.transforms.DestConfig; +import org.elasticsearch.client.transform.transforms.QueryConfig; +import org.elasticsearch.client.transform.transforms.SourceConfig; +import org.elasticsearch.client.transform.transforms.pivot.AggregationConfig; +import org.elasticsearch.client.transform.transforms.pivot.DateHistogramGroupSource; +import org.elasticsearch.client.transform.transforms.pivot.GroupConfig; +import org.elasticsearch.client.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.client.transform.transforms.pivot.SingleGroupSource; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; diff --git a/x-pack/plugin/data-frame/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformIT.java b/x-pack/plugin/transform/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformIT.java similarity index 96% rename from x-pack/plugin/data-frame/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformIT.java rename to x-pack/plugin/transform/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformIT.java index b239d461b1c..7cdb5351534 100644 --- a/x-pack/plugin/data-frame/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformIT.java +++ b/x-pack/plugin/transform/qa/multi-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformIT.java @@ -16,13 +16,13 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformStats; -import org.elasticsearch.client.dataframe.transforms.DestConfig; -import org.elasticsearch.client.dataframe.transforms.TimeSyncConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.SingleGroupSource; -import org.elasticsearch.client.dataframe.transforms.pivot.TermsGroupSource; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate; +import org.elasticsearch.client.transform.transforms.DataFrameTransformStats; +import org.elasticsearch.client.transform.transforms.DestConfig; +import org.elasticsearch.client.transform.transforms.TimeSyncConfig; +import org.elasticsearch.client.transform.transforms.pivot.SingleGroupSource; +import org.elasticsearch.client.transform.transforms.pivot.TermsGroupSource; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/build.gradle b/x-pack/plugin/transform/qa/single-node-tests/build.gradle similarity index 87% rename from x-pack/plugin/data-frame/qa/single-node-tests/build.gradle rename to x-pack/plugin/transform/qa/single-node-tests/build.gradle index 3100c2002c5..95cb164ff9a 100644 --- a/x-pack/plugin/data-frame/qa/single-node-tests/build.gradle +++ b/x-pack/plugin/transform/qa/single-node-tests/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'elasticsearch.rest-test' dependencies { testCompile project(path: xpackModule('core'), configuration: 'default') testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') - testCompile project(path: xpackModule('data-frame'), configuration: 'runtime') + testCompile project(path: xpackModule('transform'), configuration: 'runtime') testCompile project(':client:rest-high-level') } @@ -14,4 +14,4 @@ testClusters.integTest { setting 'xpack.security.enabled', 'true' setting 'xpack.license.self_generated.type', 'trial' user username: "x_pack_rest_user", password: "x-pack-test-password" -} \ No newline at end of file +} diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameAuditorIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameAuditorIT.java similarity index 98% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameAuditorIT.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameAuditorIT.java index b7aaa5c567c..8efad4f1fb2 100644 --- a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameAuditorIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameAuditorIT.java @@ -7,7 +7,7 @@ package org.elasticsearch.xpack.dataframe.integration; import org.elasticsearch.client.Request; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; import org.junit.Before; import java.io.IOException; diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameConfigurationIndexIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameConfigurationIndexIT.java similarity index 93% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameConfigurationIndexIT.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameConfigurationIndexIT.java index 499f62f13ea..e6d88ec6304 100644 --- a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameConfigurationIndexIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameConfigurationIndexIT.java @@ -14,9 +14,9 @@ import org.elasticsearch.client.ResponseException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; import java.io.IOException; diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameGetAndGetStatsIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameGetAndGetStatsIT.java similarity index 99% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameGetAndGetStatsIT.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameGetAndGetStatsIT.java index 3a7809125c7..231c8462928 100644 --- a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameGetAndGetStatsIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameGetAndGetStatsIT.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.dataframe.integration; import org.elasticsearch.client.Request; import org.elasticsearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameField; import org.junit.After; import org.junit.Before; diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameMetaDataIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameMetaDataIT.java similarity index 100% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameMetaDataIT.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameMetaDataIT.java diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFramePivotRestIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFramePivotRestIT.java similarity index 100% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFramePivotRestIT.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFramePivotRestIT.java diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameRestTestCase.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameRestTestCase.java similarity index 99% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameRestTestCase.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameRestTestCase.java index 455009b4969..f306b2a392f 100644 --- a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameRestTestCase.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameRestTestCase.java @@ -19,8 +19,8 @@ import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.test.rest.ESRestTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; import org.junit.After; import org.junit.AfterClass; diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTaskFailedStateIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTaskFailedStateIT.java similarity index 99% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTaskFailedStateIT.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTaskFailedStateIT.java index edd8eb44a9f..eac289d9b59 100644 --- a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTaskFailedStateIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTaskFailedStateIT.java @@ -14,7 +14,7 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStats; import org.junit.After; import org.junit.Before; diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformInternalIndexIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformInternalIndexIT.java similarity index 91% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformInternalIndexIT.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformInternalIndexIT.java index a604062ce4a..bef24711a4a 100644 --- a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformInternalIndexIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformInternalIndexIT.java @@ -12,30 +12,30 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.GetDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformRequest; -import org.elasticsearch.client.dataframe.UpdateDataFrameTransformResponse; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; import org.elasticsearch.client.indices.CreateIndexRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformRequest; +import org.elasticsearch.client.transform.GetDataFrameTransformResponse; +import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest; +import org.elasticsearch.client.transform.UpdateDataFrameTransformResponse; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.test.rest.ESRestTestCase; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.Collections; -import static org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex.addDataFrameTransformsConfigMappings; import static org.hamcrest.Matchers.is; +import static org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex.addDataFrameTransformsConfigMappings; import static org.hamcrest.Matchers.equalTo; diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformProgressIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformProgressIT.java similarity index 93% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformProgressIT.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformProgressIT.java index 2df5963f264..e1b1e0dff77 100644 --- a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformProgressIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameTransformProgressIT.java @@ -23,16 +23,16 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.test.rest.ESRestTestCase; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; -import org.elasticsearch.xpack.core.dataframe.transforms.DestConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.QueryConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.SourceConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.AggregationConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.GroupConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.HistogramGroupSource; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfig; -import org.elasticsearch.xpack.dataframe.transforms.TransformProgressGatherer; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.transforms.DestConfig; +import org.elasticsearch.xpack.core.transform.transforms.QueryConfig; +import org.elasticsearch.xpack.core.transform.transforms.SourceConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.AggregationConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.GroupConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.HistogramGroupSource; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.xpack.transform.transforms.TransformProgressGatherer; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameUsageIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameUsageIT.java similarity index 94% rename from x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameUsageIT.java rename to x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameUsageIT.java index e936606d127..e817e82f32c 100644 --- a/x-pack/plugin/data-frame/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameUsageIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/dataframe/integration/DataFrameUsageIT.java @@ -9,10 +9,9 @@ package org.elasticsearch.xpack.dataframe.integration; import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.common.xcontent.support.XContentMapValues; - -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStoredDoc; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStoredDoc; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; import org.junit.Before; import java.io.IOException; @@ -21,8 +20,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.xpack.core.dataframe.DataFrameField.INDEX_DOC_TYPE; -import static org.elasticsearch.xpack.dataframe.DataFrameFeatureSet.PROVIDED_STATS; +import static org.elasticsearch.xpack.core.transform.DataFrameField.INDEX_DOC_TYPE; +import static org.elasticsearch.xpack.transform.DataFrameFeatureSet.PROVIDED_STATS; public class DataFrameUsageIT extends DataFrameRestTestCase { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrame.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/DataFrame.java similarity index 83% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrame.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/DataFrame.java index 85e03744a05..ddccaf7177e 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrame.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/DataFrame.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe; +package org.elasticsearch.xpack.transform; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -42,40 +42,40 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; import org.elasticsearch.xpack.core.XPackPlugin; import org.elasticsearch.xpack.core.XPackSettings; -import org.elasticsearch.xpack.core.dataframe.DataFrameNamedXContentProvider; -import org.elasticsearch.xpack.core.dataframe.action.DeleteDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsAction; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsStatsAction; -import org.elasticsearch.xpack.core.dataframe.action.PreviewDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.PutDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformTaskAction; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.UpdateDataFrameTransformAction; import org.elasticsearch.xpack.core.scheduler.SchedulerEngine; -import org.elasticsearch.xpack.dataframe.action.TransportDeleteDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.action.TransportGetDataFrameTransformsAction; -import org.elasticsearch.xpack.dataframe.action.TransportGetDataFrameTransformsStatsAction; -import org.elasticsearch.xpack.dataframe.action.TransportPreviewDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.action.TransportPutDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.action.TransportStartDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.action.TransportStartDataFrameTransformTaskAction; -import org.elasticsearch.xpack.dataframe.action.TransportStopDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.action.TransportUpdateDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.checkpoint.DataFrameTransformsCheckpointService; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; -import org.elasticsearch.xpack.dataframe.rest.action.RestDeleteDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.rest.action.RestGetDataFrameTransformsAction; -import org.elasticsearch.xpack.dataframe.rest.action.RestGetDataFrameTransformsStatsAction; -import org.elasticsearch.xpack.dataframe.rest.action.RestPreviewDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.rest.action.RestPutDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.rest.action.RestStartDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.rest.action.RestStopDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.rest.action.RestUpdateDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.transforms.DataFrameTransformPersistentTasksExecutor; -import org.elasticsearch.xpack.dataframe.transforms.DataFrameTransformTask; +import org.elasticsearch.xpack.core.transform.DataFrameNamedXContentProvider; +import org.elasticsearch.xpack.core.transform.action.DeleteDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsAction; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsStatsAction; +import org.elasticsearch.xpack.core.transform.action.PreviewDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.PutDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformTaskAction; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.UpdateDataFrameTransformAction; +import org.elasticsearch.xpack.transform.action.TransportDeleteDataFrameTransformAction; +import org.elasticsearch.xpack.transform.action.TransportGetDataFrameTransformsAction; +import org.elasticsearch.xpack.transform.action.TransportGetDataFrameTransformsStatsAction; +import org.elasticsearch.xpack.transform.action.TransportPreviewDataFrameTransformAction; +import org.elasticsearch.xpack.transform.action.TransportPutDataFrameTransformAction; +import org.elasticsearch.xpack.transform.action.TransportStartDataFrameTransformAction; +import org.elasticsearch.xpack.transform.action.TransportStartDataFrameTransformTaskAction; +import org.elasticsearch.xpack.transform.action.TransportStopDataFrameTransformAction; +import org.elasticsearch.xpack.transform.action.TransportUpdateDataFrameTransformAction; +import org.elasticsearch.xpack.transform.checkpoint.DataFrameTransformsCheckpointService; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.transform.rest.action.RestDeleteDataFrameTransformAction; +import org.elasticsearch.xpack.transform.rest.action.RestGetDataFrameTransformsAction; +import org.elasticsearch.xpack.transform.rest.action.RestGetDataFrameTransformsStatsAction; +import org.elasticsearch.xpack.transform.rest.action.RestPreviewDataFrameTransformAction; +import org.elasticsearch.xpack.transform.rest.action.RestPutDataFrameTransformAction; +import org.elasticsearch.xpack.transform.rest.action.RestStartDataFrameTransformAction; +import org.elasticsearch.xpack.transform.rest.action.RestStopDataFrameTransformAction; +import org.elasticsearch.xpack.transform.rest.action.RestUpdateDataFrameTransformAction; +import org.elasticsearch.xpack.transform.transforms.DataFrameTransformPersistentTasksExecutor; +import org.elasticsearch.xpack.transform.transforms.DataFrameTransformTask; import java.io.IOException; import java.time.Clock; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameFeatureSet.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/DataFrameFeatureSet.java similarity index 94% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameFeatureSet.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/DataFrameFeatureSet.java index 1e595b71502..5162d81a4ec 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameFeatureSet.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/DataFrameFeatureSet.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe; +package org.elasticsearch.xpack.transform; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,15 +29,15 @@ import org.elasticsearch.xpack.core.ClientHelper; import org.elasticsearch.xpack.core.XPackFeatureSet; import org.elasticsearch.xpack.core.XPackField; import org.elasticsearch.xpack.core.XPackSettings; -import org.elasticsearch.xpack.core.dataframe.DataFrameFeatureSetUsage; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransform; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformState; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStoredDoc; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformTaskState; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.core.transform.DataFrameFeatureSetUsage; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransform; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformState; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStoredDoc; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformTaskState; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; import java.util.ArrayList; import java.util.Arrays; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/DataFrameNodes.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/DataFrameNodes.java similarity index 93% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/DataFrameNodes.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/DataFrameNodes.java index 1b2c54b331f..b9614bbc547 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/DataFrameNodes.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/DataFrameNodes.java @@ -4,11 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.persistent.PersistentTasksCustomMetaData; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameField; import java.util.Collection; import java.util.HashSet; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportDeleteDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportDeleteDataFrameTransformAction.java similarity index 92% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportDeleteDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportDeleteDataFrameTransformAction.java index fea44473622..dccd5206fcb 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportDeleteDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportDeleteDataFrameTransformAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.action.ActionListener; @@ -22,11 +22,11 @@ import org.elasticsearch.persistent.PersistentTasksCustomMetaData; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.xpack.core.dataframe.action.DeleteDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.DeleteDataFrameTransformAction.Request; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.core.transform.action.DeleteDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.DeleteDataFrameTransformAction.Request; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; import java.io.IOException; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportGetDataFrameTransformsAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetDataFrameTransformsAction.java similarity index 86% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportGetDataFrameTransformsAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetDataFrameTransformsAction.java index 8fc03681b24..fa1c658993f 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportGetDataFrameTransformsAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetDataFrameTransformsAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.action.ActionListener; @@ -22,15 +22,15 @@ import org.elasticsearch.tasks.Task; import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.core.ClientHelper; import org.elasticsearch.xpack.core.action.AbstractTransportGetResourcesAction; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsAction; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsAction.Request; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsAction.Response; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsAction; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsAction.Request; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsAction.Response; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; -import static org.elasticsearch.xpack.core.dataframe.DataFrameField.INDEX_DOC_TYPE; +import static org.elasticsearch.xpack.core.transform.DataFrameField.INDEX_DOC_TYPE; public class TransportGetDataFrameTransformsAction extends AbstractTransportGetResourcesAction { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportPutDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPutDataFrameTransformAction.java similarity index 95% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportPutDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPutDataFrameTransformAction.java index 66d4f486f71..adebdbd709d 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportPutDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPutDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.ResourceAlreadyExistsException; @@ -34,10 +34,6 @@ import org.elasticsearch.xpack.core.ClientHelper; import org.elasticsearch.xpack.core.XPackField; import org.elasticsearch.xpack.core.XPackPlugin; import org.elasticsearch.xpack.core.XPackSettings; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.action.PutDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.PutDataFrameTransformAction.Request; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; import org.elasticsearch.xpack.core.security.SecurityContext; import org.elasticsearch.xpack.core.security.action.user.HasPrivilegesAction; import org.elasticsearch.xpack.core.security.action.user.HasPrivilegesRequest; @@ -45,10 +41,14 @@ import org.elasticsearch.xpack.core.security.action.user.HasPrivilegesResponse; import org.elasticsearch.xpack.core.security.authz.RoleDescriptor; import org.elasticsearch.xpack.core.security.authz.permission.ResourcePrivileges; import org.elasticsearch.xpack.core.security.support.Exceptions; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; -import org.elasticsearch.xpack.dataframe.transforms.SourceDestValidator; -import org.elasticsearch.xpack.dataframe.transforms.pivot.Pivot; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.action.PutDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.PutDataFrameTransformAction.Request; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.transform.transforms.SourceDestValidator; +import org.elasticsearch.xpack.transform.transforms.pivot.Pivot; import java.io.IOException; import java.time.Instant; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportStartDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartDataFrameTransformAction.java similarity index 95% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportStartDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartDataFrameTransformAction.java index 6aaf46965ea..9400209ece5 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportStartDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -34,18 +34,18 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.core.ClientHelper; import org.elasticsearch.xpack.core.XPackField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformTaskAction; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransform; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformState; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformTaskState; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; -import org.elasticsearch.xpack.dataframe.persistence.DataframeIndex; -import org.elasticsearch.xpack.dataframe.transforms.SourceDestValidator; -import org.elasticsearch.xpack.dataframe.transforms.pivot.Pivot; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformTaskAction; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransform; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformState; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformTaskState; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.transform.persistence.DataframeIndex; +import org.elasticsearch.xpack.transform.transforms.SourceDestValidator; +import org.elasticsearch.xpack.transform.transforms.pivot.Pivot; import java.io.IOException; import java.time.Clock; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportStartDataFrameTransformTaskAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartDataFrameTransformTaskAction.java similarity index 96% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportStartDataFrameTransformTaskAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartDataFrameTransformTaskAction.java index 17df98e0c2b..9a1dfe86894 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportStartDataFrameTransformTaskAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStartDataFrameTransformTaskAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.action.ActionListener; @@ -20,8 +20,8 @@ import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.core.XPackField; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformTaskAction; -import org.elasticsearch.xpack.dataframe.transforms.DataFrameTransformTask; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformTaskAction; +import org.elasticsearch.xpack.transform.transforms.DataFrameTransformTask; import java.util.List; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportStopDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStopDataFrameTransformAction.java similarity index 95% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportStopDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStopDataFrameTransformAction.java index 721bf1825d4..3cd0367e181 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportStopDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStopDataFrameTransformAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,15 +30,15 @@ import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.xpack.core.action.util.PageParams; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction.Request; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction.Response; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformState; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformTaskState; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; -import org.elasticsearch.xpack.dataframe.transforms.DataFrameTransformTask; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction.Request; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction.Response; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformState; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformTaskState; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.transform.transforms.DataFrameTransformTask; import java.util.ArrayList; import java.util.HashSet; @@ -47,7 +47,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import static org.elasticsearch.xpack.core.dataframe.DataFrameMessages.DATA_FRAME_CANNOT_STOP_FAILED_TRANSFORM; +import static org.elasticsearch.xpack.core.transform.DataFrameMessages.DATA_FRAME_CANNOT_STOP_FAILED_TRANSFORM; public class TransportStopDataFrameTransformAction extends TransportTasksAction { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportUpdateDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportUpdateDataFrameTransformAction.java similarity index 94% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportUpdateDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportUpdateDataFrameTransformAction.java index 9b81efdd056..34fdd83f7e9 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportUpdateDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportUpdateDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,24 +33,24 @@ import org.elasticsearch.xpack.core.ClientHelper; import org.elasticsearch.xpack.core.XPackField; import org.elasticsearch.xpack.core.XPackPlugin; import org.elasticsearch.xpack.core.XPackSettings; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.action.UpdateDataFrameTransformAction; -import org.elasticsearch.xpack.core.dataframe.action.UpdateDataFrameTransformAction.Request; -import org.elasticsearch.xpack.core.dataframe.action.UpdateDataFrameTransformAction.Response; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigUpdate; import org.elasticsearch.xpack.core.security.SecurityContext; import org.elasticsearch.xpack.core.security.action.user.HasPrivilegesAction; import org.elasticsearch.xpack.core.security.action.user.HasPrivilegesRequest; import org.elasticsearch.xpack.core.security.action.user.HasPrivilegesResponse; import org.elasticsearch.xpack.core.security.authz.permission.ResourcePrivileges; import org.elasticsearch.xpack.core.security.support.Exceptions; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; -import org.elasticsearch.xpack.dataframe.persistence.DataframeIndex; -import org.elasticsearch.xpack.dataframe.persistence.SeqNoPrimaryTermAndIndex; -import org.elasticsearch.xpack.dataframe.transforms.SourceDestValidator; -import org.elasticsearch.xpack.dataframe.transforms.pivot.Pivot; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.action.UpdateDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.action.UpdateDataFrameTransformAction.Request; +import org.elasticsearch.xpack.core.transform.action.UpdateDataFrameTransformAction.Response; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigUpdate; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.transform.persistence.DataframeIndex; +import org.elasticsearch.xpack.transform.persistence.SeqNoPrimaryTermAndIndex; +import org.elasticsearch.xpack.transform.transforms.SourceDestValidator; +import org.elasticsearch.xpack.transform.transforms.pivot.Pivot; import java.io.IOException; import java.time.Clock; @@ -58,7 +58,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static org.elasticsearch.xpack.dataframe.action.TransportPutDataFrameTransformAction.buildPrivilegeCheck; +import static org.elasticsearch.xpack.transform.action.TransportPutDataFrameTransformAction.buildPrivilegeCheck; public class TransportUpdateDataFrameTransformAction extends TransportMasterNodeAction { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/CheckpointException.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/CheckpointException.java similarity index 91% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/CheckpointException.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/CheckpointException.java index f8405d37057..6f7a778d301 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/CheckpointException.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/CheckpointException.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.checkpoint; +package org.elasticsearch.xpack.transform.checkpoint; import org.elasticsearch.ElasticsearchException; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/CheckpointProvider.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/CheckpointProvider.java similarity index 89% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/CheckpointProvider.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/CheckpointProvider.java index 8dcab5879fb..65e973e49a7 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/CheckpointProvider.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/CheckpointProvider.java @@ -4,13 +4,13 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.checkpoint; +package org.elasticsearch.xpack.transform.checkpoint; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointingInfo; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointingInfo; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; /** * Interface for checkpoint creation, checking for changes and getting statistics about checkpoints diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformsCheckpointService.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DataFrameTransformsCheckpointService.java similarity index 87% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformsCheckpointService.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DataFrameTransformsCheckpointService.java index 85ebcde85c0..0427acf3502 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformsCheckpointService.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DataFrameTransformsCheckpointService.java @@ -4,19 +4,19 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.checkpoint; +package org.elasticsearch.xpack.transform.checkpoint; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; import org.elasticsearch.client.Client; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointingInfo; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; -import org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointingInfo; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; /** * DataFrameTransform Checkpoint Service diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/DefaultCheckpointProvider.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProvider.java similarity index 96% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/DefaultCheckpointProvider.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProvider.java index 5464304d5b8..708665c0675 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/DefaultCheckpointProvider.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProvider.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.checkpoint; +package org.elasticsearch.xpack.transform.checkpoint; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -20,14 +20,14 @@ import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.client.Client; import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.xpack.core.ClientHelper; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointingInfo; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointingInfo; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; import java.util.Arrays; import java.util.Collections; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/TimeBasedCheckpointProvider.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java similarity index 91% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/TimeBasedCheckpointProvider.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java index 276d3fe3bcc..bcf37e27e86 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/checkpoint/TimeBasedCheckpointProvider.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.checkpoint; +package org.elasticsearch.xpack.transform.checkpoint; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,11 +18,11 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.xpack.core.ClientHelper; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.TimeSyncConfig; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; public class TimeBasedCheckpointProvider extends DefaultCheckpointProvider { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/notifications/DataFrameAuditor.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/notifications/DataFrameAuditor.java similarity index 81% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/notifications/DataFrameAuditor.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/notifications/DataFrameAuditor.java index 9d3e7f51c2e..4f09b96e187 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/notifications/DataFrameAuditor.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/notifications/DataFrameAuditor.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.notifications; +package org.elasticsearch.xpack.transform.notifications; import org.elasticsearch.client.Client; import org.elasticsearch.xpack.core.common.notifications.AbstractAuditor; -import org.elasticsearch.xpack.core.dataframe.notifications.DataFrameAuditMessage; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.core.transform.notifications.DataFrameAuditMessage; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; import static org.elasticsearch.xpack.core.ClientHelper.DATA_FRAME_ORIGIN; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameInternalIndex.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/DataFrameInternalIndex.java similarity index 96% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameInternalIndex.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/DataFrameInternalIndex.java index f1f5dd85b93..c410f2f0c70 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameInternalIndex.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/DataFrameInternalIndex.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.persistence; +package org.elasticsearch.xpack.transform.persistence; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -14,20 +14,20 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.xpack.core.common.notifications.AbstractAuditMessage; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformState; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStoredDoc; -import org.elasticsearch.xpack.core.dataframe.transforms.DestConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.SourceConfig; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformState; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStoredDoc; +import org.elasticsearch.xpack.core.transform.transforms.DestConfig; +import org.elasticsearch.xpack.core.transform.transforms.SourceConfig; import java.io.IOException; import java.util.Collections; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.mapper.MapperService.SINGLE_MAPPING_NAME; -import static org.elasticsearch.xpack.core.dataframe.DataFrameField.TRANSFORM_ID; +import static org.elasticsearch.xpack.core.transform.DataFrameField.TRANSFORM_ID; public final class DataFrameInternalIndex { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameTransformsConfigManager.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/DataFrameTransformsConfigManager.java similarity index 98% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameTransformsConfigManager.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/DataFrameTransformsConfigManager.java index b58b96a8d19..a9315978c55 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameTransformsConfigManager.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/DataFrameTransformsConfigManager.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.persistence; +package org.elasticsearch.xpack.transform.persistence; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -48,11 +48,11 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.xpack.core.action.util.ExpandedIdsMatcher; import org.elasticsearch.xpack.core.action.util.PageParams; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStoredDoc; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStoredDoc; import java.io.IOException; import java.io.InputStream; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataframeIndex.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/DataframeIndex.java similarity index 94% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataframeIndex.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/DataframeIndex.java index 347e0b91428..41cf385d23a 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/DataframeIndex.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/DataframeIndex.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.persistence; +package org.elasticsearch.xpack.transform.persistence; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -16,9 +16,9 @@ import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; import java.io.IOException; import java.time.Clock; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/SeqNoPrimaryTermAndIndex.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/SeqNoPrimaryTermAndIndex.java similarity index 97% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/SeqNoPrimaryTermAndIndex.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/SeqNoPrimaryTermAndIndex.java index 68d88c18fe6..fb1f0370428 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/persistence/SeqNoPrimaryTermAndIndex.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/SeqNoPrimaryTermAndIndex.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.persistence; +package org.elasticsearch.xpack.transform.persistence; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.search.SearchHit; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestDeleteDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestDeleteDataFrameTransformAction.java similarity index 89% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestDeleteDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestDeleteDataFrameTransformAction.java index 4d891427e4d..ee574b99339 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestDeleteDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestDeleteDataFrameTransformAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.rest.action; +package org.elasticsearch.xpack.transform.rest.action; import org.elasticsearch.client.node.NodeClient; @@ -11,8 +11,8 @@ import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestToXContentListener; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.DeleteDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.DeleteDataFrameTransformAction; public class RestDeleteDataFrameTransformAction extends BaseRestHandler { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestGetDataFrameTransformsAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestGetDataFrameTransformsAction.java similarity index 89% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestGetDataFrameTransformsAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestGetDataFrameTransformsAction.java index 7dce1c7789a..35d6ac94127 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestGetDataFrameTransformsAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestGetDataFrameTransformsAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.rest.action; +package org.elasticsearch.xpack.transform.rest.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.rest.BaseRestHandler; @@ -12,10 +12,10 @@ import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestToXContentListener; import org.elasticsearch.xpack.core.action.util.PageParams; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsAction; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsAction; -import static org.elasticsearch.xpack.core.dataframe.DataFrameField.ALLOW_NO_MATCH; +import static org.elasticsearch.xpack.core.transform.DataFrameField.ALLOW_NO_MATCH; public class RestGetDataFrameTransformsAction extends BaseRestHandler { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestGetDataFrameTransformsStatsAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestGetDataFrameTransformsStatsAction.java similarity index 89% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestGetDataFrameTransformsStatsAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestGetDataFrameTransformsStatsAction.java index 7e96f34fa3f..e69f2b91430 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestGetDataFrameTransformsStatsAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestGetDataFrameTransformsStatsAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.rest.action; +package org.elasticsearch.xpack.transform.rest.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.rest.BaseRestHandler; @@ -12,10 +12,10 @@ import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestToXContentListener; import org.elasticsearch.xpack.core.action.util.PageParams; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.GetDataFrameTransformsStatsAction; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.GetDataFrameTransformsStatsAction; -import static org.elasticsearch.xpack.core.dataframe.DataFrameField.ALLOW_NO_MATCH; +import static org.elasticsearch.xpack.core.transform.DataFrameField.ALLOW_NO_MATCH; public class RestGetDataFrameTransformsStatsAction extends BaseRestHandler { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestPreviewDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestPreviewDataFrameTransformAction.java similarity index 88% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestPreviewDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestPreviewDataFrameTransformAction.java index 6f8df5cad47..604ffef8acc 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestPreviewDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestPreviewDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.rest.action; +package org.elasticsearch.xpack.transform.rest.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContentParser; @@ -12,8 +12,8 @@ import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestToXContentListener; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.PreviewDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.PreviewDataFrameTransformAction; import java.io.IOException; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestPutDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestPutDataFrameTransformAction.java similarity index 89% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestPutDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestPutDataFrameTransformAction.java index 5bd2c9fe479..96c18522642 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestPutDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestPutDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.rest.action; +package org.elasticsearch.xpack.transform.rest.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContentParser; @@ -12,8 +12,8 @@ import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestToXContentListener; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.PutDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.PutDataFrameTransformAction; import java.io.IOException; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestStartDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestStartDataFrameTransformAction.java similarity index 90% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestStartDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestStartDataFrameTransformAction.java index 44c2c66fbb7..74844461f1e 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestStartDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestStartDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.rest.action; +package org.elasticsearch.xpack.transform.rest.action; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.client.node.NodeClient; @@ -12,8 +12,8 @@ import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestToXContentListener; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformAction; public class RestStartDataFrameTransformAction extends BaseRestHandler { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestStopDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestStopDataFrameTransformAction.java similarity index 91% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestStopDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestStopDataFrameTransformAction.java index 112fe708d59..e7ee0b33e52 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestStopDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestStopDataFrameTransformAction.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.rest.action; +package org.elasticsearch.xpack.transform.rest.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.unit.TimeValue; @@ -11,8 +11,8 @@ import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestToXContentListener; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.StopDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.StopDataFrameTransformAction; public class RestStopDataFrameTransformAction extends BaseRestHandler { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestUpdateDataFrameTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestUpdateDataFrameTransformAction.java similarity index 90% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestUpdateDataFrameTransformAction.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestUpdateDataFrameTransformAction.java index 5449f3e8d9e..f07f14310cf 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/rest/action/RestUpdateDataFrameTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/rest/action/RestUpdateDataFrameTransformAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.rest.action; +package org.elasticsearch.xpack.transform.rest.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContentParser; @@ -12,8 +12,8 @@ import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.RestToXContentListener; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.action.UpdateDataFrameTransformAction; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.action.UpdateDataFrameTransformAction; import java.io.IOException; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/ClientDataFrameIndexer.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientDataFrameIndexer.java similarity index 96% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/ClientDataFrameIndexer.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientDataFrameIndexer.java index a64de70dc5f..24baef58c1f 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/ClientDataFrameIndexer.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientDataFrameIndexer.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -24,22 +24,22 @@ import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.xpack.core.ClientHelper; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformState; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStoredDoc; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformTaskState; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; import org.elasticsearch.xpack.core.indexing.IndexerState; -import org.elasticsearch.xpack.dataframe.checkpoint.CheckpointProvider; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; -import org.elasticsearch.xpack.dataframe.persistence.SeqNoPrimaryTermAndIndex; -import org.elasticsearch.xpack.dataframe.transforms.pivot.AggregationResultUtils; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformState; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStoredDoc; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformTaskState; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; +import org.elasticsearch.xpack.transform.checkpoint.CheckpointProvider; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.transform.persistence.SeqNoPrimaryTermAndIndex; +import org.elasticsearch.xpack.transform.transforms.pivot.AggregationResultUtils; import java.time.Instant; import java.util.Map; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/ClientDataFrameIndexerBuilder.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientDataFrameIndexerBuilder.java similarity index 86% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/ClientDataFrameIndexerBuilder.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientDataFrameIndexerBuilder.java index 672cdcc25ef..26c85bbbcc2 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/ClientDataFrameIndexerBuilder.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientDataFrameIndexerBuilder.java @@ -4,19 +4,19 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.elasticsearch.client.Client; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; import org.elasticsearch.xpack.core.indexing.IndexerState; -import org.elasticsearch.xpack.dataframe.checkpoint.CheckpointProvider; -import org.elasticsearch.xpack.dataframe.checkpoint.DataFrameTransformsCheckpointService; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.transform.checkpoint.CheckpointProvider; +import org.elasticsearch.xpack.transform.checkpoint.DataFrameTransformsCheckpointService; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexer.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/DataFrameIndexer.java similarity index 96% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexer.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/DataFrameIndexer.java index bb03df373cd..09218829049 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexer.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/DataFrameIndexer.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -24,19 +24,19 @@ import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregation; import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; -import org.elasticsearch.xpack.core.dataframe.utils.ExceptionsHelper; import org.elasticsearch.xpack.core.indexing.AsyncTwoPhaseIndexer; import org.elasticsearch.xpack.core.indexing.IndexerState; import org.elasticsearch.xpack.core.indexing.IterationResult; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.transforms.pivot.Pivot; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.utils.ExceptionsHelper; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.transforms.pivot.Pivot; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformPersistentTasksExecutor.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/DataFrameTransformPersistentTasksExecutor.java similarity index 94% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformPersistentTasksExecutor.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/DataFrameTransformPersistentTasksExecutor.java index 2757aaf95db..4b43fea7bdc 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformPersistentTasksExecutor.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/DataFrameTransformPersistentTasksExecutor.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -28,23 +28,23 @@ import org.elasticsearch.persistent.PersistentTasksCustomMetaData; import org.elasticsearch.persistent.PersistentTasksExecutor; import org.elasticsearch.tasks.TaskId; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformTaskAction; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransform; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformState; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStoredDoc; import org.elasticsearch.xpack.core.indexing.IndexerState; import org.elasticsearch.xpack.core.scheduler.SchedulerEngine; -import org.elasticsearch.xpack.dataframe.DataFrame; -import org.elasticsearch.xpack.dataframe.checkpoint.DataFrameTransformsCheckpointService; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; -import org.elasticsearch.xpack.dataframe.persistence.SeqNoPrimaryTermAndIndex; -import org.elasticsearch.xpack.dataframe.transforms.pivot.SchemaUtil; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformTaskAction; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransform; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformState; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStoredDoc; +import org.elasticsearch.xpack.transform.DataFrame; +import org.elasticsearch.xpack.transform.checkpoint.DataFrameTransformsCheckpointService; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.transform.persistence.SeqNoPrimaryTermAndIndex; +import org.elasticsearch.xpack.transform.transforms.pivot.SchemaUtil; import java.util.ArrayList; import java.util.List; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/DataFrameTransformTask.java similarity index 95% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/DataFrameTransformTask.java index a5d0bfd2ff9..d22f452e362 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/DataFrameTransformTask.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -21,30 +21,30 @@ import org.elasticsearch.persistent.PersistentTasksCustomMetaData; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.tasks.TaskId; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformTaskAction; -import org.elasticsearch.xpack.core.dataframe.action.StartDataFrameTransformTaskAction.Response; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransform; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointingInfo; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformState; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformTaskState; import org.elasticsearch.xpack.core.indexing.IndexerState; import org.elasticsearch.xpack.core.scheduler.SchedulerEngine; import org.elasticsearch.xpack.core.scheduler.SchedulerEngine.Event; -import org.elasticsearch.xpack.dataframe.checkpoint.DataFrameTransformsCheckpointService; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.SeqNoPrimaryTermAndIndex; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformTaskAction; +import org.elasticsearch.xpack.core.transform.action.StartDataFrameTransformTaskAction.Response; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransform; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointingInfo; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformState; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformTaskState; +import org.elasticsearch.xpack.transform.checkpoint.DataFrameTransformsCheckpointService; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.SeqNoPrimaryTermAndIndex; import java.util.Arrays; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import static org.elasticsearch.xpack.core.dataframe.DataFrameMessages.DATA_FRAME_CANNOT_START_FAILED_TRANSFORM; -import static org.elasticsearch.xpack.core.dataframe.DataFrameMessages.DATA_FRAME_CANNOT_STOP_FAILED_TRANSFORM; +import static org.elasticsearch.xpack.core.transform.DataFrameMessages.DATA_FRAME_CANNOT_START_FAILED_TRANSFORM; +import static org.elasticsearch.xpack.core.transform.DataFrameMessages.DATA_FRAME_CANNOT_STOP_FAILED_TRANSFORM; public class DataFrameTransformTask extends AllocatedPersistentTask implements SchedulerEngine.Listener { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/IDGenerator.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/IDGenerator.java similarity index 98% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/IDGenerator.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/IDGenerator.java index 6d6f8455851..c0ebe325494 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/IDGenerator.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/IDGenerator.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.apache.lucene.util.BytesRefBuilder; import org.elasticsearch.common.Numbers; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/SourceDestValidator.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/SourceDestValidator.java similarity index 96% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/SourceDestValidator.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/SourceDestValidator.java index 3f5ae039a9a..7cf9637dae4 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/SourceDestValidator.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/SourceDestValidator.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.action.support.IndicesOptions; @@ -13,8 +13,8 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.common.Strings; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; import java.util.Arrays; import java.util.HashSet; @@ -40,7 +40,7 @@ public final class SourceDestValidator { * Validates the DataFrameTransformConfiguration source and destination indices. * * A simple name validation is done on {@link DataFrameTransformConfig#getDestination()} inside - * {@link org.elasticsearch.xpack.core.dataframe.action.PutDataFrameTransformAction} + * {@link org.elasticsearch.xpack.core.transform.action.PutDataFrameTransformAction} * * So, no need to do the name checks here. * diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/TransformProgressGatherer.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformProgressGatherer.java similarity index 94% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/TransformProgressGatherer.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformProgressGatherer.java index a7c37f7c2e4..fe06a511873 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/TransformProgressGatherer.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformProgressGatherer.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.SearchAction; @@ -16,8 +16,8 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.xpack.core.ClientHelper; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; import java.util.function.Function; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtils.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationResultUtils.java similarity index 97% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtils.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationResultUtils.java index 80c4b50e6e2..ded56534f6b 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtils.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationResultUtils.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms.pivot; +package org.elasticsearch.xpack.transform.transforms.pivot; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.Numbers; @@ -21,10 +21,10 @@ import org.elasticsearch.search.aggregations.metrics.GeoBounds; import org.elasticsearch.search.aggregations.metrics.GeoCentroid; import org.elasticsearch.search.aggregations.metrics.NumericMetricsAggregation.SingleValue; import org.elasticsearch.search.aggregations.metrics.ScriptedMetric; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.GroupConfig; -import org.elasticsearch.xpack.dataframe.transforms.IDGenerator; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.pivot.GroupConfig; +import org.elasticsearch.xpack.transform.transforms.IDGenerator; import java.util.Arrays; import java.util.Collection; @@ -35,7 +35,7 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.elasticsearch.xpack.dataframe.transforms.pivot.SchemaUtil.isNumericType; +import static org.elasticsearch.xpack.transform.transforms.pivot.SchemaUtil.isNumericType; public final class AggregationResultUtils { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/Aggregations.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Aggregations.java similarity index 97% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/Aggregations.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Aggregations.java index 7006ac7e0da..c307789a0a8 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/Aggregations.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Aggregations.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms.pivot; +package org.elasticsearch.xpack.transform.transforms.pivot; import java.util.Locale; import java.util.Set; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/Pivot.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Pivot.java similarity index 96% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/Pivot.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Pivot.java index 23b6d5b5621..12c6995d33f 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/Pivot.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Pivot.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms.pivot; +package org.elasticsearch.xpack.transform.transforms.pivot; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -27,12 +27,12 @@ import org.elasticsearch.search.aggregations.PipelineAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregation; import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.SourceConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.GroupConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.SingleGroupSource; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.SourceConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.GroupConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.SingleGroupSource; import java.io.IOException; import java.util.Collection; diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/SchemaUtil.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/SchemaUtil.java similarity index 98% rename from x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/SchemaUtil.java rename to x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/SchemaUtil.java index 2aad83f5a25..26bec18ea59 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/pivot/SchemaUtil.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/SchemaUtil.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms.pivot; +package org.elasticsearch.xpack.transform.transforms.pivot; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -21,7 +21,7 @@ import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBu import org.elasticsearch.search.aggregations.support.MultiValuesSourceAggregationBuilder; import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder; import org.elasticsearch.xpack.core.ClientHelper; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfig; import java.util.HashMap; import java.util.Map; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameFeatureSetTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/DataFrameFeatureSetTests.java similarity index 97% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameFeatureSetTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/DataFrameFeatureSetTests.java index 35c3a19ab6b..554f159f7c8 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameFeatureSetTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/DataFrameFeatureSetTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe; +package org.elasticsearch.xpack.transform; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.support.PlainActionFuture; @@ -23,7 +23,7 @@ import org.elasticsearch.search.aggregations.metrics.NumericMetricsAggregation; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.xpack.core.XPackFeatureSet; import org.elasticsearch.xpack.core.XPackFeatureSet.Usage; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; import org.junit.Before; import java.io.IOException; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; -import static org.elasticsearch.xpack.dataframe.DataFrameFeatureSet.PROVIDED_STATS; +import static org.elasticsearch.xpack.transform.DataFrameFeatureSet.PROVIDED_STATS; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.mock; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameSingleNodeTestCase.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/DataFrameSingleNodeTestCase.java similarity index 96% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameSingleNodeTestCase.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/DataFrameSingleNodeTestCase.java index 38820d315f7..60be7e1204d 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameSingleNodeTestCase.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/DataFrameSingleNodeTestCase.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe; +package org.elasticsearch.xpack.transform; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.LatchedActionListener; @@ -15,7 +15,7 @@ import org.elasticsearch.index.reindex.ReindexPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.xpack.core.template.TemplateUtils; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; import org.junit.Before; import java.util.Collection; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/LocalStateDataFrame.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/LocalStateDataFrame.java similarity index 95% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/LocalStateDataFrame.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/LocalStateDataFrame.java index f4b3221ec9d..1ea7457e750 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/LocalStateDataFrame.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/LocalStateDataFrame.java @@ -3,11 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe; +package org.elasticsearch.xpack.transform; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.license.XPackLicenseState; import org.elasticsearch.xpack.core.LocalStateCompositeXPackPlugin; + import java.nio.file.Path; public class LocalStateDataFrame extends LocalStateCompositeXPackPlugin { diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/action/DataFrameNodesTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/DataFrameNodesTests.java similarity index 94% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/action/DataFrameNodesTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/DataFrameNodesTests.java index d13c33fe9aa..04d0d2b0b7a 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/action/DataFrameNodesTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/DataFrameNodesTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; @@ -15,8 +15,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.persistent.PersistentTaskParams; import org.elasticsearch.persistent.PersistentTasksCustomMetaData; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransform; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransform; import java.util.Arrays; import java.util.Collections; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/action/TransportStopDataFrameTransformActionTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/TransportStopDataFrameTransformActionTests.java similarity index 93% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/action/TransportStopDataFrameTransformActionTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/TransportStopDataFrameTransformActionTests.java index 61fad63c832..e2a01f3a104 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/action/TransportStopDataFrameTransformActionTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/action/TransportStopDataFrameTransformActionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.action; +package org.elasticsearch.xpack.transform.action; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.Version; @@ -12,11 +12,11 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.persistent.PersistentTasksCustomMetaData; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransform; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformState; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformTaskState; import org.elasticsearch.xpack.core.indexing.IndexerState; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransform; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformState; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformTaskState; import java.util.Arrays; import java.util.Collections; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java similarity index 94% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java index ad45ab61772..146796a53e5 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.checkpoint; +package org.elasticsearch.xpack.transform.checkpoint; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; @@ -39,17 +39,17 @@ import org.elasticsearch.index.store.StoreStats; import org.elasticsearch.index.warmer.WarmerStats; import org.elasticsearch.search.suggest.completion.CompletionStats; import org.elasticsearch.test.client.NoOpClient; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPositionTests; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointingInfo; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigTests; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgress; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgressTests; -import org.elasticsearch.xpack.dataframe.DataFrameSingleNodeTestCase; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPositionTests; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointingInfo; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgress; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformProgressTests; +import org.elasticsearch.xpack.transform.DataFrameSingleNodeTestCase; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; import org.junit.AfterClass; import org.junit.Before; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformsCheckpointServiceTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DataFrameTransformsCheckpointServiceTests.java similarity index 99% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformsCheckpointServiceTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DataFrameTransformsCheckpointServiceTests.java index 8a9a5bd50af..2633dd34031 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformsCheckpointServiceTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DataFrameTransformsCheckpointServiceTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.checkpoint; +package org.elasticsearch.xpack.transform.checkpoint; import org.elasticsearch.action.admin.indices.stats.CommonStats; import org.elasticsearch.action.admin.indices.stats.ShardStats; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DefaultCheckpointProviderTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProviderTests.java similarity index 95% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DefaultCheckpointProviderTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProviderTests.java index 0912724e702..3b62dbeb4df 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DefaultCheckpointProviderTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProviderTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.checkpoint; +package org.elasticsearch.xpack.transform.checkpoint; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -15,11 +15,11 @@ import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.MockLogAppender; import org.elasticsearch.test.MockLogAppender.LoggingExpectation; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigTests; -import org.elasticsearch.xpack.dataframe.notifications.MockDataFrameAuditor; -import org.elasticsearch.xpack.dataframe.notifications.MockDataFrameAuditor.AuditExpectation; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.xpack.transform.notifications.MockDataFrameAuditor; +import org.elasticsearch.xpack.transform.notifications.MockDataFrameAuditor.AuditExpectation; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; import org.junit.Before; import java.util.Collections; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/notifications/MockDataFrameAuditor.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/notifications/MockDataFrameAuditor.java similarity index 98% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/notifications/MockDataFrameAuditor.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/notifications/MockDataFrameAuditor.java index 41a499aa6e1..88384d52d45 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/notifications/MockDataFrameAuditor.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/notifications/MockDataFrameAuditor.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.notifications; +package org.elasticsearch.xpack.transform.notifications; import org.elasticsearch.client.Client; import org.elasticsearch.common.regex.Regex; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameTransformsConfigManagerTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/DataFrameTransformsConfigManagerTests.java similarity index 96% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameTransformsConfigManagerTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/DataFrameTransformsConfigManagerTests.java index 56c8d9ce07f..268c48c137f 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/persistence/DataFrameTransformsConfigManagerTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/DataFrameTransformsConfigManagerTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.persistence; +package org.elasticsearch.xpack.transform.persistence; import org.elasticsearch.ResourceAlreadyExistsException; import org.elasticsearch.ResourceNotFoundException; @@ -19,14 +19,14 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.xpack.core.action.util.PageParams; -import org.elasticsearch.xpack.core.dataframe.DataFrameMessages; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpointTests; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigTests; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStoredDoc; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStoredDocTests; -import org.elasticsearch.xpack.dataframe.DataFrameSingleNodeTestCase; +import org.elasticsearch.xpack.core.transform.DataFrameMessages; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpointTests; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStoredDoc; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformStoredDocTests; +import org.elasticsearch.xpack.transform.DataFrameSingleNodeTestCase; import org.junit.Before; import java.util.ArrayList; @@ -36,8 +36,8 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import static org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex.mappings; -import static org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager.TO_XCONTENT_PARAMS; +import static org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex.mappings; +import static org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager.TO_XCONTENT_PARAMS; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/persistence/DataframeIndexTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/DataframeIndexTests.java similarity index 96% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/persistence/DataframeIndexTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/DataframeIndexTests.java index 2ff7756c82f..e09348c6cf5 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/persistence/DataframeIndexTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/DataframeIndexTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.persistence; +package org.elasticsearch.xpack.transform.persistence; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.create.CreateIndexAction; @@ -13,7 +13,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfigTests; import org.mockito.ArgumentCaptor; import java.io.IOException; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/persistence/SeqNoPrimaryTermAndIndexTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/SeqNoPrimaryTermAndIndexTests.java similarity index 97% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/persistence/SeqNoPrimaryTermAndIndexTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/SeqNoPrimaryTermAndIndexTests.java index 747c7baf390..63fa5e3a77d 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/persistence/SeqNoPrimaryTermAndIndexTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/SeqNoPrimaryTermAndIndexTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.persistence; +package org.elasticsearch.xpack.transform.persistence; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.index.shard.ShardId; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/rest/action/RestDeleteDataFrameTransformActionTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/rest/action/RestDeleteDataFrameTransformActionTests.java similarity index 97% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/rest/action/RestDeleteDataFrameTransformActionTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/rest/action/RestDeleteDataFrameTransformActionTests.java index 6a41ff8cd2c..055d781f79f 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/rest/action/RestDeleteDataFrameTransformActionTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/rest/action/RestDeleteDataFrameTransformActionTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.rest.action; +package org.elasticsearch.xpack.transform.rest.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesArray; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/ClientDataFrameIndexerTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/ClientDataFrameIndexerTests.java similarity index 88% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/ClientDataFrameIndexerTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/ClientDataFrameIndexerTests.java index e4c0085f9d9..9b7fb893d89 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/ClientDataFrameIndexerTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/ClientDataFrameIndexerTests.java @@ -4,21 +4,21 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.elasticsearch.client.Client; import org.elasticsearch.tasks.TaskId; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransform; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; import org.elasticsearch.xpack.core.indexing.IndexerState; import org.elasticsearch.xpack.core.scheduler.SchedulerEngine; -import org.elasticsearch.xpack.dataframe.checkpoint.CheckpointProvider; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransform; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.transform.checkpoint.CheckpointProvider; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; import java.time.Instant; import java.util.Collections; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexerTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/DataFrameIndexerTests.java similarity index 94% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexerTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/DataFrameIndexerTests.java index 7de80b12a03..ce867965fdc 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexerTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/DataFrameIndexerTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.apache.lucene.search.TotalHits; import org.elasticsearch.action.ActionListener; @@ -27,17 +27,17 @@ import org.elasticsearch.search.profile.SearchProfileShardResults; import org.elasticsearch.search.suggest.Suggest; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerPosition; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformCheckpoint; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.AggregationConfigTests; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.GroupConfigTests; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfig; import org.elasticsearch.xpack.core.indexing.IndexerState; import org.elasticsearch.xpack.core.indexing.IterationResult; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.transforms.pivot.Pivot; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerPosition; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformCheckpoint; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.AggregationConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.pivot.GroupConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.transforms.pivot.Pivot; import org.junit.Before; import java.io.PrintWriter; @@ -52,8 +52,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import java.util.function.Function; -import static org.elasticsearch.xpack.core.dataframe.transforms.DestConfigTests.randomDestConfig; -import static org.elasticsearch.xpack.core.dataframe.transforms.SourceConfigTests.randomSourceConfig; +import static org.elasticsearch.xpack.core.transform.transforms.DestConfigTests.randomDestConfig; +import static org.elasticsearch.xpack.core.transform.transforms.SourceConfigTests.randomSourceConfig; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.empty; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformPersistentTasksExecutorTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/DataFrameTransformPersistentTasksExecutorTests.java similarity index 96% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformPersistentTasksExecutorTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/DataFrameTransformPersistentTasksExecutorTests.java index ee30609e1a5..c2d87c90ef0 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformPersistentTasksExecutorTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/DataFrameTransformPersistentTasksExecutorTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.elasticsearch.Version; import org.elasticsearch.client.Client; @@ -29,12 +29,12 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.persistent.PersistentTasksCustomMetaData; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransform; import org.elasticsearch.xpack.core.scheduler.SchedulerEngine; -import org.elasticsearch.xpack.dataframe.checkpoint.DataFrameTransformsCheckpointService; -import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameInternalIndex; -import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransform; +import org.elasticsearch.xpack.transform.checkpoint.DataFrameTransformsCheckpointService; +import org.elasticsearch.xpack.transform.notifications.DataFrameAuditor; +import org.elasticsearch.xpack.transform.persistence.DataFrameInternalIndex; +import org.elasticsearch.xpack.transform.persistence.DataFrameTransformsConfigManager; import java.util.ArrayList; import java.util.Arrays; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/IDGeneratorTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/IDGeneratorTests.java similarity index 97% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/IDGeneratorTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/IDGeneratorTests.java index 3ce5dd81558..68cdcb2ee15 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/IDGeneratorTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/IDGeneratorTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.elasticsearch.test.ESTestCase; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/SourceDestValidatorTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/SourceDestValidatorTests.java similarity index 96% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/SourceDestValidatorTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/SourceDestValidatorTests.java index c9f4a0bc06b..48fdf734491 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/SourceDestValidatorTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/SourceDestValidatorTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms; +package org.elasticsearch.xpack.transform.transforms; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.Version; @@ -17,10 +17,10 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.DestConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.SourceConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.xpack.core.transform.transforms.DestConfig; +import org.elasticsearch.xpack.core.transform.transforms.SourceConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfigTests; import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_CREATION_DATE; import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtilsTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationResultUtilsTests.java similarity index 99% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtilsTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationResultUtilsTests.java index 350ddf19423..85969813d51 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtilsTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationResultUtilsTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms.pivot; +package org.elasticsearch.xpack.transform.transforms.pivot; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.geo.GeoPoint; @@ -56,9 +56,9 @@ import org.elasticsearch.search.aggregations.pipeline.ParsedSimpleValue; import org.elasticsearch.search.aggregations.pipeline.ParsedStatsBucket; import org.elasticsearch.search.aggregations.pipeline.StatsBucketPipelineAggregationBuilder; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; -import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameIndexerTransformStats; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.GroupConfig; +import org.elasticsearch.xpack.core.transform.DataFrameField; +import org.elasticsearch.xpack.core.transform.transforms.DataFrameIndexerTransformStats; +import org.elasticsearch.xpack.core.transform.transforms.pivot.GroupConfig; import java.io.IOException; import java.util.Arrays; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationsTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationsTests.java similarity index 98% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationsTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationsTests.java index 12f7f2e6032..ee66d20859f 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationsTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationsTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms.pivot; +package org.elasticsearch.xpack.transform.transforms.pivot; import org.elasticsearch.test.ESTestCase; diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/PivotTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/PivotTests.java similarity index 96% rename from x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/PivotTests.java rename to x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/PivotTests.java index 3c26770ebb2..510c19df337 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/PivotTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/PivotTests.java @@ -4,14 +4,14 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.dataframe.transforms.pivot; +package org.elasticsearch.xpack.transform.transforms.pivot; import org.apache.lucene.search.TotalHits; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.action.ActionType; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.ActionType; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponseSections; @@ -28,12 +28,12 @@ import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.SearchModule; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.client.NoOpClient; -import org.elasticsearch.xpack.core.dataframe.transforms.QueryConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.SourceConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.AggregationConfig; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.GroupConfigTests; -import org.elasticsearch.xpack.core.dataframe.transforms.pivot.PivotConfig; -import org.elasticsearch.xpack.dataframe.transforms.pivot.Aggregations.AggregationType; +import org.elasticsearch.xpack.core.transform.transforms.QueryConfig; +import org.elasticsearch.xpack.core.transform.transforms.SourceConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.AggregationConfig; +import org.elasticsearch.xpack.core.transform.transforms.pivot.GroupConfigTests; +import org.elasticsearch.xpack.core.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.xpack.transform.transforms.pivot.Aggregations.AggregationType; import org.junit.After; import org.junit.Before; diff --git a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataFrameSurvivesUpgradeIT.java b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataFrameSurvivesUpgradeIT.java index 6ba042a07ba..f77e2d78dee 100644 --- a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataFrameSurvivesUpgradeIT.java +++ b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataFrameSurvivesUpgradeIT.java @@ -11,15 +11,15 @@ import org.elasticsearch.Version; import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.client.core.IndexerState; -import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsResponse; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig; -import org.elasticsearch.client.dataframe.transforms.DataFrameTransformStats; -import org.elasticsearch.client.dataframe.transforms.DestConfig; -import org.elasticsearch.client.dataframe.transforms.SourceConfig; -import org.elasticsearch.client.dataframe.transforms.TimeSyncConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.GroupConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.PivotConfig; -import org.elasticsearch.client.dataframe.transforms.pivot.TermsGroupSource; +import org.elasticsearch.client.transform.GetDataFrameTransformStatsResponse; +import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig; +import org.elasticsearch.client.transform.transforms.DataFrameTransformStats; +import org.elasticsearch.client.transform.transforms.DestConfig; +import org.elasticsearch.client.transform.transforms.SourceConfig; +import org.elasticsearch.client.transform.transforms.TimeSyncConfig; +import org.elasticsearch.client.transform.transforms.pivot.GroupConfig; +import org.elasticsearch.client.transform.transforms.pivot.PivotConfig; +import org.elasticsearch.client.transform.transforms.pivot.TermsGroupSource; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Strings; import org.elasticsearch.common.unit.TimeValue;